[Lldb-commits] [lldb] r173463 - in /lldb/trunk: examples/python/ include/lldb/ include/lldb/API/ include/lldb/Breakpoint/ include/lldb/Core/ include/lldb/Expression/ include/lldb/Host/ include/lldb/Interpreter/ include/lldb/Symbol/ include/lldb/Target/ scripts/Python/interface/ source/API/ source/Breakpoint/ source/Commands/ source/Core/ source/Expression/ source/Host/common/ source/Host/macosx/ source/Interpreter/ source/Plugins/ABI/MacOSX-arm/ source/Plugins/ABI/MacOSX-i386/ source/Plugins/ABI/SysV-x86_64/ source/Plu...

Filipe Cabecinhas filcab at gmail.com
Fri Jan 25 12:34:28 PST 2013


Hi Greg.

Modified: lldb/trunk/include/lldb/Breakpoint/Watchpoint.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Watchpoint.h?rev=173463&r1=173462&r2=173463&view=diff
============================================================
==================
--- lldb/trunk/include/lldb/Breakpoint/Watchpoint.h (original)
+++ lldb/trunk/include/lldb/Breakpoint/Watchpoint.h Fri Jan 25 12:06:21 2013
@@ -76,7 +76,7 @@
         DISALLOW_COPY_AND_ASSIGN (WatchpointEventData);
     };

-    Watchpoint (Target& target, lldb::addr_t addr, size_t size, const
ClangASTType *type, bool hardware = true);
+    Watchpoint (Target& target, lldb::addr_t addr, uint32_t size, const
ClangASTType *type, bool hardware = true);
     ~Watchpoint ();

     void

Why the reverse change (size_t -> uint32_t) on Watchpoint?

Thanks,

  Filipe

  F


On Fri, Jan 25, 2013 at 10:06 AM, Greg Clayton <gclayton at apple.com> wrote:

> Author: gclayton
> Date: Fri Jan 25 12:06:21 2013
> New Revision: 173463
>
> URL: http://llvm.org/viewvc/llvm-project?rev=173463&view=rev
> Log:
> <rdar://problem/13069948>
>
> Major fixed to allow reading files that are over 4GB. The main problems
> were that the DataExtractor was using 32 bit offsets as a data cursor, and
> since we mmap all of our object files we could run into cases where if we
> had a very large core file that was over 4GB, we were running into the 4GB
> boundary.
>
> So I defined a new "lldb::offset_t" which should be used for all file
> offsets.
>
> After making this change, I enabled warnings for data loss and for
> enexpected implicit conversions temporarily and found a ton of things that
> I fixed.
>
> Any functions that take an index internally, should use "size_t" for any
> indexes and also should return "size_t" for any sizes of collections.
>
>
> Modified:
>     lldb/trunk/examples/python/operating_system.py
>     lldb/trunk/include/lldb/API/SBData.h
>     lldb/trunk/include/lldb/Breakpoint/Breakpoint.h
>     lldb/trunk/include/lldb/Breakpoint/BreakpointIDList.h
>     lldb/trunk/include/lldb/Breakpoint/BreakpointList.h
>     lldb/trunk/include/lldb/Breakpoint/BreakpointLocationCollection.h
>     lldb/trunk/include/lldb/Breakpoint/BreakpointLocationList.h
>     lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h
>     lldb/trunk/include/lldb/Breakpoint/Watchpoint.h
>     lldb/trunk/include/lldb/Core/ArchSpec.h
>     lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h
>     lldb/trunk/include/lldb/Core/DataExtractor.h
>     lldb/trunk/include/lldb/Core/Debugger.h
>     lldb/trunk/include/lldb/Core/Disassembler.h
>     lldb/trunk/include/lldb/Core/FileSpecList.h
>     lldb/trunk/include/lldb/Core/FormatClasses.h
>     lldb/trunk/include/lldb/Core/FormatManager.h
>     lldb/trunk/include/lldb/Core/FormatNavigator.h
>     lldb/trunk/include/lldb/Core/MappedHash.h
>     lldb/trunk/include/lldb/Core/Module.h
>     lldb/trunk/include/lldb/Core/ModuleList.h
>     lldb/trunk/include/lldb/Core/PluginManager.h
>     lldb/trunk/include/lldb/Core/RegisterValue.h
>     lldb/trunk/include/lldb/Core/Scalar.h
>     lldb/trunk/include/lldb/Core/Section.h
>     lldb/trunk/include/lldb/Core/Stream.h
>     lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h
>     lldb/trunk/include/lldb/Core/StreamBuffer.h
>     lldb/trunk/include/lldb/Core/StreamCallback.h
>     lldb/trunk/include/lldb/Core/StreamFile.h
>     lldb/trunk/include/lldb/Core/StreamString.h
>     lldb/trunk/include/lldb/Core/StreamTee.h
>     lldb/trunk/include/lldb/Core/StringList.h
>     lldb/trunk/include/lldb/Core/VMRange.h
>     lldb/trunk/include/lldb/Core/Value.h
>     lldb/trunk/include/lldb/Core/ValueObject.h
>     lldb/trunk/include/lldb/Core/ValueObjectCast.h
>     lldb/trunk/include/lldb/Core/ValueObjectChild.h
>     lldb/trunk/include/lldb/Core/ValueObjectConstResult.h
>     lldb/trunk/include/lldb/Core/ValueObjectConstResultChild.h
>     lldb/trunk/include/lldb/Core/ValueObjectConstResultImpl.h
>     lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h
>     lldb/trunk/include/lldb/Core/ValueObjectList.h
>     lldb/trunk/include/lldb/Core/ValueObjectMemory.h
>     lldb/trunk/include/lldb/Core/ValueObjectRegister.h
>     lldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h
>     lldb/trunk/include/lldb/Core/ValueObjectVariable.h
>     lldb/trunk/include/lldb/Core/dwarf.h
>     lldb/trunk/include/lldb/Expression/ClangFunction.h
>     lldb/trunk/include/lldb/Expression/DWARFExpression.h
>     lldb/trunk/include/lldb/Host/File.h
>     lldb/trunk/include/lldb/Interpreter/Args.h
>     lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h
>     lldb/trunk/include/lldb/Interpreter/CommandObject.h
>     lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h
>     lldb/trunk/include/lldb/Interpreter/OptionValueArray.h
>     lldb/trunk/include/lldb/Interpreter/OptionValueDictionary.h
>     lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h
>     lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h
>     lldb/trunk/include/lldb/Symbol/Block.h
>     lldb/trunk/include/lldb/Symbol/ClangASTContext.h
>     lldb/trunk/include/lldb/Symbol/ObjectFile.h
>     lldb/trunk/include/lldb/Symbol/Symbol.h
>     lldb/trunk/include/lldb/Symbol/SymbolContext.h
>     lldb/trunk/include/lldb/Symbol/SymbolVendor.h
>     lldb/trunk/include/lldb/Symbol/Symtab.h
>     lldb/trunk/include/lldb/Symbol/Variable.h
>     lldb/trunk/include/lldb/Symbol/VariableList.h
>     lldb/trunk/include/lldb/Target/Platform.h
>     lldb/trunk/include/lldb/Target/Process.h
>     lldb/trunk/include/lldb/Target/RegisterContext.h
>     lldb/trunk/include/lldb/lldb-defines.h
>     lldb/trunk/include/lldb/lldb-types.h
>     lldb/trunk/scripts/Python/interface/SBData.i
>     lldb/trunk/source/API/SBData.cpp
>     lldb/trunk/source/Breakpoint/Breakpoint.cpp
>     lldb/trunk/source/Breakpoint/BreakpointIDList.cpp
>     lldb/trunk/source/Breakpoint/BreakpointList.cpp
>     lldb/trunk/source/Breakpoint/BreakpointLocationCollection.cpp
>     lldb/trunk/source/Breakpoint/BreakpointLocationList.cpp
>     lldb/trunk/source/Breakpoint/BreakpointResolverFileLine.cpp
>     lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp
>     lldb/trunk/source/Breakpoint/BreakpointSite.cpp
>     lldb/trunk/source/Breakpoint/Watchpoint.cpp
>     lldb/trunk/source/Commands/CommandCompletions.cpp
>     lldb/trunk/source/Commands/CommandObjectApropos.cpp
>     lldb/trunk/source/Commands/CommandObjectArgs.cpp
>     lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp
>     lldb/trunk/source/Commands/CommandObjectCommands.cpp
>     lldb/trunk/source/Commands/CommandObjectExpression.cpp
>     lldb/trunk/source/Commands/CommandObjectFrame.cpp
>     lldb/trunk/source/Commands/CommandObjectHelp.cpp
>     lldb/trunk/source/Commands/CommandObjectMemory.cpp
>     lldb/trunk/source/Commands/CommandObjectMultiword.cpp
>     lldb/trunk/source/Commands/CommandObjectPlatform.cpp
>     lldb/trunk/source/Commands/CommandObjectProcess.cpp
>     lldb/trunk/source/Commands/CommandObjectRegister.cpp
>     lldb/trunk/source/Commands/CommandObjectSource.cpp
>     lldb/trunk/source/Commands/CommandObjectSyntax.cpp
>     lldb/trunk/source/Commands/CommandObjectTarget.cpp
>     lldb/trunk/source/Commands/CommandObjectThread.cpp
>     lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp
>     lldb/trunk/source/Core/Address.cpp
>     lldb/trunk/source/Core/ArchSpec.cpp
>     lldb/trunk/source/Core/CXXFormatterFunctions.cpp
>     lldb/trunk/source/Core/ConstString.cpp
>     lldb/trunk/source/Core/DataBufferMemoryMap.cpp
>     lldb/trunk/source/Core/DataExtractor.cpp
>     lldb/trunk/source/Core/Debugger.cpp
>     lldb/trunk/source/Core/Disassembler.cpp
>     lldb/trunk/source/Core/EmulateInstruction.cpp
>     lldb/trunk/source/Core/Error.cpp
>     lldb/trunk/source/Core/FileSpecList.cpp
>     lldb/trunk/source/Core/FormatClasses.cpp
>     lldb/trunk/source/Core/FormatManager.cpp
>     lldb/trunk/source/Core/Module.cpp
>     lldb/trunk/source/Core/ModuleList.cpp
>     lldb/trunk/source/Core/PluginManager.cpp
>     lldb/trunk/source/Core/RegisterValue.cpp
>     lldb/trunk/source/Core/Scalar.cpp
>     lldb/trunk/source/Core/SearchFilter.cpp
>     lldb/trunk/source/Core/Section.cpp
>     lldb/trunk/source/Core/SourceManager.cpp
>     lldb/trunk/source/Core/Stream.cpp
>     lldb/trunk/source/Core/StreamAsynchronousIO.cpp
>     lldb/trunk/source/Core/StreamCallback.cpp
>     lldb/trunk/source/Core/StreamFile.cpp
>     lldb/trunk/source/Core/StreamString.cpp
>     lldb/trunk/source/Core/StringList.cpp
>     lldb/trunk/source/Core/UUID.cpp
>     lldb/trunk/source/Core/VMRange.cpp
>     lldb/trunk/source/Core/Value.cpp
>     lldb/trunk/source/Core/ValueObject.cpp
>     lldb/trunk/source/Core/ValueObjectCast.cpp
>     lldb/trunk/source/Core/ValueObjectChild.cpp
>     lldb/trunk/source/Core/ValueObjectConstResult.cpp
>     lldb/trunk/source/Core/ValueObjectConstResultChild.cpp
>     lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp
>     lldb/trunk/source/Core/ValueObjectDynamicValue.cpp
>     lldb/trunk/source/Core/ValueObjectList.cpp
>     lldb/trunk/source/Core/ValueObjectMemory.cpp
>     lldb/trunk/source/Core/ValueObjectRegister.cpp
>     lldb/trunk/source/Core/ValueObjectSyntheticFilter.cpp
>     lldb/trunk/source/Core/ValueObjectVariable.cpp
>     lldb/trunk/source/Expression/ClangASTSource.cpp
>     lldb/trunk/source/Expression/ClangExpressionParser.cpp
>     lldb/trunk/source/Expression/ClangFunction.cpp
>     lldb/trunk/source/Expression/DWARFExpression.cpp
>     lldb/trunk/source/Expression/IRInterpreter.cpp
>     lldb/trunk/source/Host/common/File.cpp
>     lldb/trunk/source/Host/common/FileSpec.cpp
>     lldb/trunk/source/Host/macosx/Host.mm
>     lldb/trunk/source/Host/macosx/Symbols.cpp
>     lldb/trunk/source/Interpreter/Args.cpp
>     lldb/trunk/source/Interpreter/CommandInterpreter.cpp
>     lldb/trunk/source/Interpreter/CommandObject.cpp
>     lldb/trunk/source/Interpreter/CommandReturnObject.cpp
>     lldb/trunk/source/Interpreter/PythonDataObjects.cpp
>     lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp
>     lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp
>     lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
>     lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
>     lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
>     lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h
>
> lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
>
> lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
>     lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
>     lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
>     lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h
>
> lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
>
> lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
>
> lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
>
> lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp
>
> lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
>
> lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h
>
> lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
>     lldb/trunk/source/Plugins/ObjectFile/ELF/ELFHeader.cpp
>     lldb/trunk/source/Plugins/ObjectFile/ELF/ELFHeader.h
>     lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
>     lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
>     lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
>     lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
>     lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
>     lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
>
> lldb/trunk/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
>     lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp
>     lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ThreadKDP.cpp
>     lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp
>     lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm.h
>
> lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp
>     lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_i386.h
>
> lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp
>
> lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.h
>     lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp
>     lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.h
>
> lldb/trunk/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
>
> lldb/trunk/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h
>     lldb/trunk/source/Plugins/Process/Utility/RegisterContextMemory.cpp
>     lldb/trunk/source/Plugins/Process/Utility/RegisterContextMemory.h
>
> lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
>     lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h
>     lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
>
> lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.cpp
>
> lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFLocationDescription.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFLocationList.cpp
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFLocationList.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/HashedNameToDIE.h
>     lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
>     lldb/trunk/source/Symbol/ClangASTContext.cpp
>     lldb/trunk/source/Symbol/ClangASTType.cpp
>     lldb/trunk/source/Symbol/DWARFCallFrameInfo.cpp
>     lldb/trunk/source/Symbol/Symbol.cpp
>     lldb/trunk/source/Symbol/SymbolContext.cpp
>     lldb/trunk/source/Symbol/SymbolVendor.cpp
>     lldb/trunk/source/Symbol/Symtab.cpp
>     lldb/trunk/source/Symbol/VariableList.cpp
>     lldb/trunk/source/Target/Process.cpp
>     lldb/trunk/source/Target/Target.cpp
>     lldb/trunk/source/Utility/StringExtractor.cpp
>     lldb/trunk/source/Utility/StringExtractor.h
>     lldb/trunk/tools/debugserver/source/DNBDataRef.cpp
>
> Modified: lldb/trunk/examples/python/operating_system.py
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/examples/python/operating_system.py?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/examples/python/operating_system.py (original)
> +++ lldb/trunk/examples/python/operating_system.py Fri Jan 25 12:06:21 2013
> @@ -25,8 +25,9 @@
>          return self.process.target
>
>      def create_thread(self, tid, context):
> +        print 'tid type is: ' + str(type(tid))
>          if tid == 0x444444444:
> -            thread_info = { 'tid' : 0x444444444, 'name' : 'four'  ,
> 'queue' : 'queue4', 'state' : 'stopped', 'stop_reason' : 'none' }
> +            thread_info = { 'tid' : tid, 'name' : 'four'  , 'queue' :
> 'queue4', 'state' : 'stopped', 'stop_reason' : 'none' }
>              self.threads.append(thread_info)
>              return thread_info
>          return None
>
> Modified: lldb/trunk/include/lldb/API/SBData.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBData.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/API/SBData.h (original)
> +++ lldb/trunk/include/lldb/API/SBData.h Fri Jan 25 12:06:21 2013
> @@ -49,47 +49,47 @@
>      SetByteOrder (lldb::ByteOrder endian);
>
>      float
> -    GetFloat (lldb::SBError& error, uint32_t offset);
> +    GetFloat (lldb::SBError& error, lldb::offset_t offset);
>
>      double
> -    GetDouble (lldb::SBError& error, uint32_t offset);
> +    GetDouble (lldb::SBError& error, lldb::offset_t offset);
>
>      long double
> -    GetLongDouble (lldb::SBError& error, uint32_t offset);
> +    GetLongDouble (lldb::SBError& error, lldb::offset_t offset);
>
>      lldb::addr_t
> -    GetAddress (lldb::SBError& error, uint32_t offset);
> +    GetAddress (lldb::SBError& error, lldb::offset_t offset);
>
>      uint8_t
> -    GetUnsignedInt8 (lldb::SBError& error, uint32_t offset);
> +    GetUnsignedInt8 (lldb::SBError& error, lldb::offset_t offset);
>
>      uint16_t
> -    GetUnsignedInt16 (lldb::SBError& error, uint32_t offset);
> +    GetUnsignedInt16 (lldb::SBError& error, lldb::offset_t offset);
>
>      uint32_t
> -    GetUnsignedInt32 (lldb::SBError& error, uint32_t offset);
> +    GetUnsignedInt32 (lldb::SBError& error, lldb::offset_t offset);
>
>      uint64_t
> -    GetUnsignedInt64 (lldb::SBError& error, uint32_t offset);
> +    GetUnsignedInt64 (lldb::SBError& error, lldb::offset_t offset);
>
>      int8_t
> -    GetSignedInt8 (lldb::SBError& error, uint32_t offset);
> +    GetSignedInt8 (lldb::SBError& error, lldb::offset_t offset);
>
>      int16_t
> -    GetSignedInt16 (lldb::SBError& error, uint32_t offset);
> +    GetSignedInt16 (lldb::SBError& error, lldb::offset_t offset);
>
>      int32_t
> -    GetSignedInt32 (lldb::SBError& error, uint32_t offset);
> +    GetSignedInt32 (lldb::SBError& error, lldb::offset_t offset);
>
>      int64_t
> -    GetSignedInt64 (lldb::SBError& error, uint32_t offset);
> +    GetSignedInt64 (lldb::SBError& error, lldb::offset_t offset);
>
>      const char*
> -    GetString (lldb::SBError& error, uint32_t offset);
> +    GetString (lldb::SBError& error, lldb::offset_t offset);
>
>      size_t
>      ReadRawData (lldb::SBError& error,
> -                 uint32_t offset,
> +                 lldb::offset_t offset,
>                   void *buf,
>                   size_t size);
>
>
> Modified: lldb/trunk/include/lldb/Breakpoint/Breakpoint.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Breakpoint.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Breakpoint/Breakpoint.h (original)
> +++ lldb/trunk/include/lldb/Breakpoint/Breakpoint.h Fri Jan 25 12:06:21
> 2013
> @@ -136,7 +136,7 @@
>          static lldb::BreakpointLocationSP
>          GetBreakpointLocationAtIndexFromEvent (const lldb::EventSP
> &event_sp, uint32_t loc_idx);
>
> -        static uint32_t
> +        static size_t
>          GetNumBreakpointLocationsFromEvent (const lldb::EventSP
> &event_sp);
>
>          static const BreakpointEventData *
> @@ -310,7 +310,7 @@
>      ///     greater than then number of actual locations.
>      //------------------------------------------------------------------
>      lldb::BreakpointLocationSP
> -    GetLocationAtIndex (uint32_t index);
> +    GetLocationAtIndex (size_t index);
>
>      //------------------------------------------------------------------
>      // The next section deals with various breakpoint options.
>
> Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointIDList.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointIDList.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Breakpoint/BreakpointIDList.h (original)
> +++ lldb/trunk/include/lldb/Breakpoint/BreakpointIDList.h Fri Jan 25
> 12:06:21 2013
> @@ -41,10 +41,10 @@
>      GetSize();
>
>      BreakpointID &
> -    GetBreakpointIDAtIndex (uint32_t index);
> +    GetBreakpointIDAtIndex (size_t index);
>
>      bool
> -    RemoveBreakpointIDAtIndex (uint32_t index);
> +    RemoveBreakpointIDAtIndex (size_t index);
>
>      void
>      Clear();
> @@ -56,16 +56,16 @@
>      AddBreakpointID (const char *bp_id);
>
>      bool
> -    FindBreakpointID (BreakpointID &bp_id, uint32_t *position);
> +    FindBreakpointID (BreakpointID &bp_id, size_t *position);
>
>      bool
> -    FindBreakpointID (const char *bp_id, uint32_t *position);
> +    FindBreakpointID (const char *bp_id, size_t *position);
>
>      void
> -    InsertStringArray (const char **string_array, uint32_t array_size,
> CommandReturnObject &result);
> +    InsertStringArray (const char **string_array, size_t array_size,
> CommandReturnObject &result);
>
>      static bool
> -    StringContainsIDRangeExpression (const char *in_string, uint32_t
> *range_start_len, uint32_t *range_end_pos);
> +    StringContainsIDRangeExpression (const char *in_string, size_t
> *range_start_len, size_t *range_end_pos);
>
>      static void
>      FindAndReplaceIDRanges (Args &old_args, Target *target,
> CommandReturnObject &result, Args &new_args);
>
> Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointList.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointList.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Breakpoint/BreakpointList.h (original)
> +++ lldb/trunk/include/lldb/Breakpoint/BreakpointList.h Fri Jan 25
> 12:06:21 2013
> @@ -92,7 +92,7 @@
>      ///   breakpoint doesn't exist.
>      //------------------------------------------------------------------
>      lldb::BreakpointSP
> -    GetBreakpointAtIndex (uint32_t i);
> +    GetBreakpointAtIndex (size_t i);
>
>      //------------------------------------------------------------------
>      /// Returns a shared pointer to the breakpoint with index \a i, const
> version
> @@ -105,7 +105,7 @@
>      ///   breakpoint doesn't exist.
>      //------------------------------------------------------------------
>      const lldb::BreakpointSP
> -    GetBreakpointAtIndex (uint32_t i) const;
> +    GetBreakpointAtIndex (size_t i) const;
>
>      //------------------------------------------------------------------
>      /// Returns the number of elements in this breakpoint list.
>
> Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointLocationCollection.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointLocationCollection.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Breakpoint/BreakpointLocationCollection.h
> (original)
> +++ lldb/trunk/include/lldb/Breakpoint/BreakpointLocationCollection.h Fri
> Jan 25 12:06:21 2013
> @@ -101,7 +101,7 @@
>      ///     pointer if the breakpoint doesn't exist.
>      //------------------------------------------------------------------
>      lldb::BreakpointLocationSP
> -    GetByIndex (uint32_t i);
> +    GetByIndex (size_t i);
>
>      //------------------------------------------------------------------
>      /// Returns a shared pointer to the breakpoint location with index
> @@ -115,7 +115,7 @@
>      ///     pointer if the breakpoint doesn't exist.
>      //------------------------------------------------------------------
>      const lldb::BreakpointLocationSP
> -    GetByIndex (uint32_t i) const;
> +    GetByIndex (size_t i) const;
>
>      //------------------------------------------------------------------
>      /// Returns the number of elements in this breakpoint location list.
>
> Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointLocationList.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointLocationList.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Breakpoint/BreakpointLocationList.h (original)
> +++ lldb/trunk/include/lldb/Breakpoint/BreakpointLocationList.h Fri Jan 25
> 12:06:21 2013
> @@ -119,7 +119,7 @@
>      ///     pointer if the breakpoint doesn't exist.
>      //------------------------------------------------------------------
>      lldb::BreakpointLocationSP
> -    GetByIndex (uint32_t i);
> +    GetByIndex (size_t i);
>
>      //------------------------------------------------------------------
>      /// Returns a shared pointer to the breakpoint location with index
> @@ -133,7 +133,7 @@
>      ///     pointer if the breakpoint doesn't exist.
>      //------------------------------------------------------------------
>      const lldb::BreakpointLocationSP
> -    GetByIndex (uint32_t i) const;
> +    GetByIndex (size_t i) const;
>
>      //------------------------------------------------------------------
>      /// Removes all the locations in this list from their breakpoint site
>
> Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h (original)
> +++ lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h Fri Jan 25
> 12:06:21 2013
> @@ -83,7 +83,7 @@
>      //------------------------------------------------------------------
>      bool
>      SetTrapOpcode (const uint8_t *trap_opcode,
> -                   size_t trap_opcode_size);
> +                   uint32_t trap_opcode_size);
>
>      //------------------------------------------------------------------
>      /// Gets the original instruction bytes that were overwritten by the
> trap
> @@ -168,7 +168,7 @@
>      /// @return
>      ///    The number of owners.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      GetNumberOfOwners ();
>
>      //------------------------------------------------------------------
> @@ -183,7 +183,7 @@
>      ///    A shared pointer to the breakpoint location at that index.
>      //------------------------------------------------------------------
>      lldb::BreakpointLocationSP
> -    GetOwnerAtIndex (uint32_t index);
> +    GetOwnerAtIndex (size_t idx);
>
>      //------------------------------------------------------------------
>      /// Check whether the owners of this breakpoint site have any
> @@ -244,7 +244,7 @@
>      /// @param[in] context
>      ///    \a break_loc_id is the Breakpoint Location to remove.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      RemoveOwner (lldb::break_id_t break_id,
>                   lldb::break_id_t break_loc_id);
>
> @@ -265,7 +265,6 @@
>      BreakpointSite (BreakpointSiteList *list,
>                      const lldb::BreakpointLocationSP& owner,
>                      lldb::addr_t m_addr,
> -                    lldb::tid_t tid,
>                      bool use_hardware);
>
>      DISALLOW_COPY_AND_ASSIGN(BreakpointSite);
>
> Modified: lldb/trunk/include/lldb/Breakpoint/Watchpoint.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Watchpoint.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Breakpoint/Watchpoint.h (original)
> +++ lldb/trunk/include/lldb/Breakpoint/Watchpoint.h Fri Jan 25 12:06:21
> 2013
> @@ -76,7 +76,7 @@
>          DISALLOW_COPY_AND_ASSIGN (WatchpointEventData);
>      };
>
> -    Watchpoint (Target& target, lldb::addr_t addr, size_t size, const
> ClangASTType *type, bool hardware = true);
> +    Watchpoint (Target& target, lldb::addr_t addr, uint32_t size, const
> ClangASTType *type, bool hardware = true);
>      ~Watchpoint ();
>
>      void
>
> Modified: lldb/trunk/include/lldb/Core/ArchSpec.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ArchSpec.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/ArchSpec.h (original)
> +++ lldb/trunk/include/lldb/Core/ArchSpec.h Fri Jan 25 12:06:21 2013
> @@ -159,7 +159,7 @@
>      const ArchSpec&
>      operator= (const ArchSpec& rhs);
>
> -    static uint32_t
> +    static size_t
>      AutoComplete (const char *name,
>                    StringList &matches);
>
>
> Modified: lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h (original)
> +++ lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h Fri Jan 25
> 12:06:21 2013
> @@ -135,11 +135,11 @@
>          public:
>              NSArrayMSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
>
> -            virtual uint32_t
> +            virtual size_t
>              CalculateNumChildren ();
>
>              virtual lldb::ValueObjectSP
> -            GetChildAtIndex (uint32_t idx);
> +            GetChildAtIndex (size_t idx);
>
>              virtual bool
>              Update();
> @@ -166,11 +166,11 @@
>          public:
>              NSArrayISyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
>
> -            virtual uint32_t
> +            virtual size_t
>              CalculateNumChildren ();
>
>              virtual lldb::ValueObjectSP
> -            GetChildAtIndex (uint32_t idx);
> +            GetChildAtIndex (size_t idx);
>
>              virtual bool
>              Update();
> @@ -186,7 +186,7 @@
>          private:
>              ExecutionContextRef m_exe_ctx_ref;
>              uint8_t m_ptr_size;
> -            uint64_t m_items;
> +            size_t m_items;
>              lldb::addr_t m_data_ptr;
>              ClangASTType m_id_type;
>              std::vector<lldb::ValueObjectSP> m_children;
> @@ -197,11 +197,11 @@
>          public:
>              NSArrayCodeRunningSyntheticFrontEnd (lldb::ValueObjectSP
> valobj_sp);
>
> -            virtual uint32_t
> +            virtual size_t
>              CalculateNumChildren ();
>
>              virtual lldb::ValueObjectSP
> -            GetChildAtIndex (uint32_t idx);
> +            GetChildAtIndex (size_t idx);
>
>              virtual bool
>              Update();
> @@ -242,11 +242,11 @@
>          public:
>              NSDictionaryISyntheticFrontEnd (lldb::ValueObjectSP
> valobj_sp);
>
> -            virtual uint32_t
> +            virtual size_t
>              CalculateNumChildren ();
>
>              virtual lldb::ValueObjectSP
> -            GetChildAtIndex (uint32_t idx);
> +            GetChildAtIndex (size_t idx);
>
>              virtual bool
>              Update();
> @@ -298,11 +298,11 @@
>          public:
>              NSDictionaryMSyntheticFrontEnd (lldb::ValueObjectSP
> valobj_sp);
>
> -            virtual uint32_t
> +            virtual size_t
>              CalculateNumChildren ();
>
>              virtual lldb::ValueObjectSP
> -            GetChildAtIndex (uint32_t idx);
> +            GetChildAtIndex (size_t idx);
>
>              virtual bool
>              Update();
> @@ -328,11 +328,11 @@
>          public:
>              NSDictionaryCodeRunningSyntheticFrontEnd (lldb::ValueObjectSP
> valobj_sp);
>
> -            virtual uint32_t
> +            virtual size_t
>              CalculateNumChildren ();
>
>              virtual lldb::ValueObjectSP
> -            GetChildAtIndex (uint32_t idx);
> +            GetChildAtIndex (size_t idx);
>
>              virtual bool
>              Update();
>
> Modified: lldb/trunk/include/lldb/Core/DataExtractor.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/DataExtractor.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/DataExtractor.h (original)
> +++ lldb/trunk/include/lldb/Core/DataExtractor.h Fri Jan 25 12:06:21 2013
> @@ -86,7 +86,7 @@
>      /// @param[in] addr_size
>      ///     A new address byte size value.
>      //------------------------------------------------------------------
> -    DataExtractor (const void* data, uint32_t data_length,
> lldb::ByteOrder byte_order, uint8_t addr_size);
> +    DataExtractor (const void* data, lldb::offset_t data_length,
> lldb::ByteOrder byte_order, uint32_t addr_size);
>
>      //------------------------------------------------------------------
>      /// Construct with shared data.
> @@ -105,7 +105,7 @@
>      /// @param[in] addr_size
>      ///     A new address byte size value.
>      //------------------------------------------------------------------
> -    DataExtractor (const lldb::DataBufferSP& data_sp, lldb::ByteOrder
> byte_order, uint8_t addr_size);
> +    DataExtractor (const lldb::DataBufferSP& data_sp, lldb::ByteOrder
> byte_order, uint32_t addr_size);
>
>      //------------------------------------------------------------------
>      /// Construct with a subset of \a data.
> @@ -130,7 +130,7 @@
>      /// @param[in] length
>      ///     The length in bytes of the subset of data.
>      //------------------------------------------------------------------
> -    DataExtractor (const DataExtractor& data, uint32_t offset, uint32_t
> length);
> +    DataExtractor (const DataExtractor& data, lldb::offset_t offset,
> lldb::offset_t length);
>
>      DataExtractor (const DataExtractor& rhs);
>      //------------------------------------------------------------------
> @@ -204,10 +204,10 @@
>      /// @return
>      ///     The offset at which dumping ended.
>      //------------------------------------------------------------------
> -    uint32_t
> +    lldb::offset_t
>      PutToLog (Log *log,
> -              uint32_t offset,
> -              uint32_t length,
> +              lldb::offset_t offset,
> +              lldb::offset_t length,
>                uint64_t base_addr,
>                uint32_t num_per_line,
>                Type type,
> @@ -273,13 +273,13 @@
>      /// @return
>      ///     The offset at which dumping ended.
>      //------------------------------------------------------------------
> -    uint32_t
> +    lldb::offset_t
>      Dump (Stream *s,
> -          uint32_t offset,
> +          lldb::offset_t offset,
>            lldb::Format item_format,
> -          uint32_t item_byte_size,
> -          uint32_t item_count,
> -          uint32_t num_per_line,
> +          size_t item_byte_size,
> +          size_t item_count,
> +          size_t num_per_line,
>            uint64_t base_addr,
>            uint32_t item_bit_size,
>            uint32_t item_bit_offset,
> @@ -300,7 +300,7 @@
>      ///     UUID value.
>      //------------------------------------------------------------------
>      void
> -    DumpUUID (Stream *s, uint32_t offset) const;
> +    DumpUUID (Stream *s, lldb::offset_t offset) const;
>
>      //------------------------------------------------------------------
>      /// Extract an arbitrary number of bytes in the specified byte
> @@ -332,7 +332,7 @@
>      ///     if there aren't enough bytes at the specified offset.
>      //------------------------------------------------------------------
>      size_t
> -    ExtractBytes (uint32_t offset, uint32_t length, lldb::ByteOrder
> dst_byte_order, void *dst) const;
> +    ExtractBytes (lldb::offset_t offset, lldb::offset_t length,
> lldb::ByteOrder dst_byte_order, void *dst) const;
>
>      //------------------------------------------------------------------
>      /// Extract an address from \a *offset_ptr.
> @@ -353,10 +353,10 @@
>      ///     The extracted address value.
>      //------------------------------------------------------------------
>      uint64_t
> -    GetAddress (uint32_t *offset_ptr) const;
> +    GetAddress (lldb::offset_t *offset_ptr) const;
>
>      uint64_t
> -    GetAddress_unchecked (uint32_t *offset_ptr) const;
> +    GetAddress_unchecked (lldb::offset_t *offset_ptr) const;
>
>      //------------------------------------------------------------------
>      /// Get the current address size.
> @@ -367,7 +367,7 @@
>      /// @return
>      ///     The size in bytes of address values that will be extracted.
>      //------------------------------------------------------------------
> -    uint8_t
> +    uint32_t
>      GetAddressByteSize () const
>      {
>          return m_addr_size;
> @@ -379,7 +379,7 @@
>      /// @return
>      ///     The total number of bytes of data this object refers to.
>      //------------------------------------------------------------------
> -    size_t
> +    uint64_t
>      GetByteSize () const
>      {
>          return m_end - m_start;
> @@ -408,7 +408,7 @@
>      ///     NULL will be returned.
>      //------------------------------------------------------------------
>      const char *
> -    GetCStr (uint32_t *offset_ptr) const;
> +    GetCStr (lldb::offset_t *offset_ptr) const;
>
>      //------------------------------------------------------------------
>      /// Extract \a length bytes from \a *offset_ptr.
> @@ -434,7 +434,7 @@
>      ///     and length are valid, or NULL otherwise.
>      //------------------------------------------------------------------
>      const void*
> -    GetData (uint32_t *offset_ptr, uint32_t length) const;
> +    GetData (lldb::offset_t *offset_ptr, lldb::offset_t length) const;
>
>      //------------------------------------------------------------------
>      /// Copy \a dst_len bytes from \a *offset_ptr and ensure the copied
> @@ -475,11 +475,11 @@
>      ///     Returns the number of bytes that were copied, or zero if
>      ///     anything goes wrong.
>      //------------------------------------------------------------------
> -    uint32_t
> -    CopyByteOrderedData (uint32_t src_offset,
> -                         uint32_t src_len,
> +    lldb::offset_t
> +    CopyByteOrderedData (lldb::offset_t src_offset,
> +                         lldb::offset_t src_len,
>                           void *dst,
> -                         uint32_t dst_len,
> +                         lldb::offset_t dst_len,
>                           lldb::ByteOrder dst_byte_order) const;
>
>      //------------------------------------------------------------------
> @@ -538,13 +538,13 @@
>      ///     The floating value that was extracted, or zero on failure.
>      //------------------------------------------------------------------
>      float
> -    GetFloat (uint32_t *offset_ptr) const;
> +    GetFloat (lldb::offset_t *offset_ptr) const;
>
>      double
> -    GetDouble (uint32_t *offset_ptr) const;
> +    GetDouble (lldb::offset_t *offset_ptr) const;
>
>      long double
> -    GetLongDouble (uint32_t *offset_ptr) const;
> +    GetLongDouble (lldb::offset_t *offset_ptr) const;
>
>      //------------------------------------------------------------------
>      /// Extract a GNU encoded pointer value from \a *offset_ptr.
> @@ -575,7 +575,11 @@
>      ///     The extracted GNU encoded pointer value.
>      //------------------------------------------------------------------
>      uint64_t
> -    GetGNUEHPointer (uint32_t *offset_ptr, uint32_t eh_ptr_enc,
> lldb::addr_t pc_rel_addr, lldb::addr_t text_addr, lldb::addr_t data_addr);
> +    GetGNUEHPointer (lldb::offset_t *offset_ptr,
> +                     uint32_t eh_ptr_enc,
> +                     lldb::addr_t pc_rel_addr,
> +                     lldb::addr_t text_addr,
> +                     lldb::addr_t data_addr);
>
>      //------------------------------------------------------------------
>      /// Extract an integer of size \a byte_size from \a *offset_ptr.
> @@ -601,7 +605,7 @@
>      ///     The integer value that was extracted, or zero on failure.
>      //------------------------------------------------------------------
>      uint32_t
> -    GetMaxU32 (uint32_t *offset_ptr, uint32_t byte_size) const;
> +    GetMaxU32 (lldb::offset_t *offset_ptr, size_t byte_size) const;
>
>      //------------------------------------------------------------------
>      /// Extract an unsigned integer of size \a byte_size from \a
> @@ -630,10 +634,10 @@
>      ///     failure.
>      //------------------------------------------------------------------
>      uint64_t
> -    GetMaxU64 (uint32_t *offset_ptr, uint32_t byte_size) const;
> +    GetMaxU64 (lldb::offset_t *offset_ptr, size_t byte_size) const;
>
>      uint64_t
> -    GetMaxU64_unchecked (uint32_t *offset_ptr, uint32_t byte_size) const;
> +    GetMaxU64_unchecked (lldb::offset_t *offset_ptr, size_t byte_size)
> const;
>
>      //------------------------------------------------------------------
>      /// Extract an signed integer of size \a byte_size from \a
> *offset_ptr.
> @@ -661,7 +665,7 @@
>      ///     or zero on failure.
>      //------------------------------------------------------------------
>      int64_t
> -    GetMaxS64 (uint32_t *offset_ptr, uint32_t size) const;
> +    GetMaxS64 (lldb::offset_t *offset_ptr, size_t size) const;
>
>      //------------------------------------------------------------------
>      /// Extract an unsigned integer of size \a byte_size from \a
> @@ -700,7 +704,10 @@
>      ///     zero on failure.
>      //------------------------------------------------------------------
>      uint64_t
> -    GetMaxU64Bitfield (uint32_t *offset_ptr, uint32_t size, uint32_t
> bitfield_bit_size, uint32_t bitfield_bit_offset) const;
> +    GetMaxU64Bitfield (lldb::offset_t *offset_ptr,
> +                       size_t size,
> +                       uint32_t bitfield_bit_size,
> +                       uint32_t bitfield_bit_offset) const;
>
>      //------------------------------------------------------------------
>      /// Extract an signed integer of size \a byte_size from \a
> @@ -739,7 +746,10 @@
>      ///     zero on failure.
>      //------------------------------------------------------------------
>      int64_t
> -    GetMaxS64Bitfield (uint32_t *offset_ptr, uint32_t size, uint32_t
> bitfield_bit_size, uint32_t bitfield_bit_offset) const;
> +    GetMaxS64Bitfield (lldb::offset_t *offset_ptr,
> +                       size_t size,
> +                       uint32_t bitfield_bit_size,
> +                       uint32_t bitfield_bit_offset) const;
>
>      //------------------------------------------------------------------
>      /// Extract an pointer from \a *offset_ptr.
> @@ -760,7 +770,7 @@
>      ///     The extracted pointer value as a 64 integer.
>      //------------------------------------------------------------------
>      uint64_t
> -    GetPointer (uint32_t *offset_ptr) const;
> +    GetPointer (lldb::offset_t *offset_ptr) const;
>
>      //------------------------------------------------------------------
>      /// Get the current byte order value.
> @@ -792,10 +802,10 @@
>      ///     The extracted uint8_t value.
>      //------------------------------------------------------------------
>      uint8_t
> -    GetU8 ( uint32_t *offset_ptr) const;
> +    GetU8 ( lldb::offset_t *offset_ptr) const;
>
>      uint8_t
> -    GetU8_unchecked (uint32_t *offset_ptr) const
> +    GetU8_unchecked (lldb::offset_t *offset_ptr) const
>      {
>          uint8_t val = m_start[*offset_ptr];
>          *offset_ptr += 1;
> @@ -803,13 +813,13 @@
>      }
>
>      uint16_t
> -    GetU16_unchecked (uint32_t *offset_ptr) const;
> +    GetU16_unchecked (lldb::offset_t *offset_ptr) const;
>
>      uint32_t
> -    GetU32_unchecked (uint32_t *offset_ptr) const;
> +    GetU32_unchecked (lldb::offset_t *offset_ptr) const;
>
>      uint64_t
> -    GetU64_unchecked (uint32_t *offset_ptr) const;
> +    GetU64_unchecked (lldb::offset_t *offset_ptr) const;
>      //------------------------------------------------------------------
>      /// Extract \a count uint8_t values from \a *offset_ptr.
>      ///
> @@ -836,7 +846,7 @@
>      ///     NULL otherise.
>      //------------------------------------------------------------------
>      void *
> -    GetU8 ( uint32_t *offset_ptr, void *dst, uint32_t count) const;
> +    GetU8 (lldb::offset_t *offset_ptr, void *dst, uint32_t count) const;
>
>      //------------------------------------------------------------------
>      /// Extract a uint16_t value from \a *offset_ptr.
> @@ -855,7 +865,7 @@
>      ///     The extracted uint16_t value.
>      //------------------------------------------------------------------
>      uint16_t
> -    GetU16 (uint32_t *offset_ptr) const;
> +    GetU16 (lldb::offset_t *offset_ptr) const;
>
>      //------------------------------------------------------------------
>      /// Extract \a count uint16_t values from \a *offset_ptr.
> @@ -883,7 +893,7 @@
>      ///     NULL otherise.
>      //------------------------------------------------------------------
>      void *
> -    GetU16 (uint32_t *offset_ptr, void *dst, uint32_t count) const;
> +    GetU16 (lldb::offset_t *offset_ptr, void *dst, uint32_t count) const;
>
>      //------------------------------------------------------------------
>      /// Extract a uint32_t value from \a *offset_ptr.
> @@ -902,7 +912,7 @@
>      ///     The extracted uint32_t value.
>      //------------------------------------------------------------------
>      uint32_t
> -    GetU32 (uint32_t *offset_ptr) const;
> +    GetU32 (lldb::offset_t *offset_ptr) const;
>
>      //------------------------------------------------------------------
>      /// Extract \a count uint32_t values from \a *offset_ptr.
> @@ -930,7 +940,7 @@
>      ///     NULL otherise.
>      //------------------------------------------------------------------
>      void *
> -    GetU32 (uint32_t *offset_ptr, void *dst, uint32_t count) const;
> +    GetU32 (lldb::offset_t *offset_ptr, void *dst, uint32_t count) const;
>
>      //------------------------------------------------------------------
>      /// Extract a uint64_t value from \a *offset_ptr.
> @@ -949,7 +959,7 @@
>      ///     The extracted uint64_t value.
>      //------------------------------------------------------------------
>      uint64_t
> -    GetU64 (uint32_t *offset_ptr) const;
> +    GetU64 (lldb::offset_t *offset_ptr) const;
>
>      //------------------------------------------------------------------
>      /// Extract \a count uint64_t values from \a *offset_ptr.
> @@ -977,7 +987,7 @@
>      ///     NULL otherise.
>      //------------------------------------------------------------------
>      void *
> -    GetU64 ( uint32_t *offset_ptr, void *dst, uint32_t count) const;
> +    GetU64 ( lldb::offset_t *offset_ptr, void *dst, uint32_t count) const;
>
>      //------------------------------------------------------------------
>      /// Extract a signed LEB128 value from \a *offset_ptr.
> @@ -998,7 +1008,7 @@
>      ///     The extracted signed integer value.
>      //------------------------------------------------------------------
>      int64_t
> -    GetSLEB128 (uint32_t *offset_ptr) const;
> +    GetSLEB128 (lldb::offset_t *offset_ptr) const;
>
>      //------------------------------------------------------------------
>      /// Extract a unsigned LEB128 value from \a *offset_ptr.
> @@ -1019,7 +1029,7 @@
>      ///     The extracted unsigned integer value.
>      //------------------------------------------------------------------
>      uint64_t
> -    GetULEB128 (uint32_t *offset_ptr) const;
> +    GetULEB128 (lldb::offset_t *offset_ptr) const;
>
>      lldb::DataBufferSP &
>      GetSharedDataBuffer ()
> @@ -1042,7 +1052,7 @@
>      ///     NULL otherwise.
>      //------------------------------------------------------------------
>      const char *
> -    PeekCStr (uint32_t offset) const;
> +    PeekCStr (lldb::offset_t offset) const;
>
>      //------------------------------------------------------------------
>      /// Peek at a bytes at \a offset.
> @@ -1056,7 +1066,7 @@
>      ///     otherwise.
>      //------------------------------------------------------------------
>      const uint8_t*
> -    PeekData (uint32_t offset, uint32_t length) const;
> +    PeekData (lldb::offset_t offset, lldb::offset_t length) const;
>
>      //------------------------------------------------------------------
>      /// Set the address byte size.
> @@ -1068,7 +1078,7 @@
>      ///     The size in bytes to use when extracting addresses.
>      //------------------------------------------------------------------
>      void
> -    SetAddressByteSize (uint8_t addr_size)
> +    SetAddressByteSize (uint32_t addr_size)
>      {
>          m_addr_size = addr_size;
>      }
> @@ -1094,8 +1104,8 @@
>      /// @return
>      ///     The number of bytes that this object now contains.
>      //------------------------------------------------------------------
> -    uint32_t
> -    SetData (const void *bytes, uint32_t length, lldb::ByteOrder
> byte_order);
> +    lldb::offset_t
> +    SetData (const void *bytes, lldb::offset_t length, lldb::ByteOrder
> byte_order);
>
>      //------------------------------------------------------------------
>      /// Adopt a subset of \a data.
> @@ -1123,8 +1133,8 @@
>      /// @return
>      ///     The number of bytes that this object now contains.
>      //------------------------------------------------------------------
> -    uint32_t
> -    SetData (const DataExtractor& data, uint32_t offset, uint32_t length);
> +    lldb::offset_t
> +    SetData (const DataExtractor& data, lldb::offset_t offset,
> lldb::offset_t length);
>
>      //------------------------------------------------------------------
>      /// Adopt a subset of shared data in \a data_sp.
> @@ -1151,8 +1161,8 @@
>      /// @return
>      ///     The number of bytes that this object now contains.
>      //------------------------------------------------------------------
> -    uint32_t
> -    SetData (const lldb::DataBufferSP& data_sp, uint32_t offset = 0,
> uint32_t length = UINT32_MAX);
> +    lldb::offset_t
> +    SetData (const lldb::DataBufferSP& data_sp, lldb::offset_t offset =
> 0, lldb::offset_t length = LLDB_INVALID_OFFSET);
>
>      //------------------------------------------------------------------
>      /// Set the byte_order value.
> @@ -1188,7 +1198,7 @@
>      //      The number of bytes consumed during the extraction.
>      //------------------------------------------------------------------
>      uint32_t
> -    Skip_LEB128 (uint32_t *offset_ptr) const;
> +    Skip_LEB128 (lldb::offset_t *offset_ptr) const;
>
>      //------------------------------------------------------------------
>      /// Test the validity of \a offset.
> @@ -1198,7 +1208,7 @@
>      ///     object, \b false otherwise.
>      //------------------------------------------------------------------
>      bool
> -    ValidOffset (uint32_t offset) const
> +    ValidOffset (lldb::offset_t offset) const
>      {
>          return offset < GetByteSize();
>      }
> @@ -1211,7 +1221,7 @@
>      ///     length bytes available at that offset, \b false otherwise.
>      //------------------------------------------------------------------
>      bool
> -    ValidOffsetForDataOfSize (uint32_t offset, uint32_t length) const;
> +    ValidOffsetForDataOfSize (lldb::offset_t offset, lldb::offset_t
> length) const;
>
>      size_t
>      Copy (DataExtractor& dest_data) const;
> @@ -1220,7 +1230,7 @@
>      Append (DataExtractor& rhs);
>
>      bool
> -    Append (void* bytes, uint32_t length);
> +    Append (void* bytes, lldb::offset_t length);
>
>  protected:
>      //------------------------------------------------------------------
> @@ -1229,7 +1239,7 @@
>      const uint8_t * m_start;        ///< A pointer to the first byte of
> data.
>      const uint8_t * m_end;          ///< A pointer to the byte that is
> past the end of the data.
>      lldb::ByteOrder m_byte_order;   ///< The byte order of the data we
> are extracting from.
> -    uint8_t         m_addr_size;    ///< The address size to use when
> extracting pointers or addresses
> +    uint32_t m_addr_size;           ///< The address size to use when
> extracting pointers or addresses
>      mutable lldb::DataBufferSP m_data_sp; ///< The shared pointer to data
> that can be shared among multilple instances
>  };
>
>
> Modified: lldb/trunk/include/lldb/Core/Debugger.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Debugger.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/Debugger.h (original)
> +++ lldb/trunk/include/lldb/Core/Debugger.h Fri Jan 25 12:06:21 2013
> @@ -227,11 +227,11 @@
>      static lldb::DebuggerSP
>      FindDebuggerWithInstanceName (const ConstString &instance_name);
>
> -    static uint32_t
> +    static size_t
>      GetNumDebuggers();
>
>      static lldb::DebuggerSP
> -    GetDebuggerAtIndex (uint32_t);
> +    GetDebuggerAtIndex (size_t index);
>
>      static bool
>      FormatPrompt (const char *format,
>
> Modified: lldb/trunk/include/lldb/Core/Disassembler.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Disassembler.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/Disassembler.h (original)
> +++ lldb/trunk/include/lldb/Core/Disassembler.h Fri Jan 25 12:06:21 2013
> @@ -88,8 +88,8 @@
>
>      virtual size_t
>      Decode (const Disassembler &disassembler,
> -            const DataExtractor& data,
> -            uint32_t data_offset) = 0;
> +            const DataExtractor& data,
> +            lldb::offset_t data_offset) = 0;
>
>      virtual void
>      SetDescription (const char *) {}  // May be overridden in sub-classes
> that have descriptions.
> @@ -166,7 +166,7 @@
>      GetMaxOpcocdeByteSize () const;
>
>      lldb::InstructionSP
> -    GetInstructionAtIndex (uint32_t idx) const;
> +    GetInstructionAtIndex (size_t idx) const;
>
>      uint32_t
>      GetIndexOfNextBranchInstruction(uint32_t start) const;
> @@ -218,7 +218,7 @@
>      virtual size_t
>      Decode (const Disassembler &disassembler,
>              const DataExtractor &data,
> -            uint32_t data_offset);
> +            lldb::offset_t data_offset);
>
>      void
>      SetOpcode (size_t opcode_size, void *opcode_data);
> @@ -350,8 +350,8 @@
>      virtual size_t
>      DecodeInstructions (const Address &base_addr,
>                          const DataExtractor& data,
> -                        uint32_t data_offset,
> -                        uint32_t num_instructions,
> +                        lldb::offset_t data_offset,
> +                        size_t num_instructions,
>                          bool append) = 0;
>
>      InstructionList &
>
> Modified: lldb/trunk/include/lldb/Core/FileSpecList.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FileSpecList.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/FileSpecList.h (original)
> +++ lldb/trunk/include/lldb/Core/FileSpecList.h Fri Jan 25 12:06:21 2013
> @@ -123,8 +123,8 @@
>      ///     The index of the file that matches \a file if it is found,
>      ///     else UINT32_MAX is returned.
>      //------------------------------------------------------------------
> -    uint32_t
> -    FindFileIndex (uint32_t idx, const FileSpec &file, bool full) const;
> +    size_t
> +    FindFileIndex (size_t idx, const FileSpec &file, bool full) const;
>
>      //------------------------------------------------------------------
>      /// Get file at index.
> @@ -143,7 +143,7 @@
>      ///     returned.
>      //------------------------------------------------------------------
>      const FileSpec &
> -    GetFileSpecAtIndex (uint32_t idx) const;
> +    GetFileSpecAtIndex (size_t idx) const;
>
>      //------------------------------------------------------------------
>      /// Get file specification pointer at index.
> @@ -159,7 +159,7 @@
>      ///     If \a idx is out of range, then an NULL is returned.
>      //------------------------------------------------------------------
>      const FileSpec *
> -    GetFileSpecPointerAtIndex (uint32_t idx) const;
> +    GetFileSpecPointerAtIndex (size_t idx) const;
>
>      //------------------------------------------------------------------
>      /// Get the memory cost of this object.
> @@ -182,11 +182,11 @@
>      /// @return
>      ///     The number of files in the file spec list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      GetSize () const;
>
>      bool
> -    Insert (uint32_t idx, const FileSpec &file)
> +    Insert (size_t idx, const FileSpec &file)
>      {
>          if (idx < m_files.size())
>          {
> @@ -202,7 +202,7 @@
>      }
>
>      bool
> -    Replace (uint32_t idx, const FileSpec &file)
> +    Replace (size_t idx, const FileSpec &file)
>      {
>          if (idx < m_files.size())
>          {
> @@ -213,7 +213,7 @@
>      }
>
>      bool
> -    Remove (uint32_t idx)
> +    Remove (size_t idx)
>      {
>          if (idx < m_files.size())
>          {
>
> Modified: lldb/trunk/include/lldb/Core/FormatClasses.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatClasses.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/FormatClasses.h (original)
> +++ lldb/trunk/include/lldb/Core/FormatClasses.h Fri Jan 25 12:06:21 2013
> @@ -237,11 +237,11 @@
>      {
>      }
>
> -    virtual uint32_t
> +    virtual size_t
>      CalculateNumChildren () = 0;
>
>      virtual lldb::ValueObjectSP
> -    GetChildAtIndex (uint32_t idx) = 0;
> +    GetChildAtIndex (size_t idx) = 0;
>
>      virtual uint32_t
>      GetIndexOfChildWithName (const ConstString &name) = 0;
> @@ -479,14 +479,14 @@
>          m_expression_paths.clear();
>      }
>
> -    int
> +    size_t
>      GetCount() const
>      {
>          return m_expression_paths.size();
>      }
>
>      const char*
> -    GetExpressionPathAtIndex(int i) const
> +    GetExpressionPathAtIndex(size_t i) const
>      {
>          return m_expression_paths[i].c_str();
>      }
> @@ -556,14 +556,14 @@
>          {
>          }
>
> -        virtual uint32_t
> +        virtual size_t
>          CalculateNumChildren()
>          {
>              return filter->GetCount();
>          }
>
>          virtual lldb::ValueObjectSP
> -        GetChildAtIndex (uint32_t idx)
> +        GetChildAtIndex (size_t idx)
>          {
>              if (idx >= filter->GetCount())
>                  return lldb::ValueObjectSP();
> @@ -720,7 +720,7 @@
>          virtual
>          ~FrontEnd();
>
> -        virtual uint32_t
> +        virtual size_t
>          CalculateNumChildren()
>          {
>              if (!m_wrapper_sp || m_interpreter == NULL)
> @@ -729,7 +729,7 @@
>          }
>
>          virtual lldb::ValueObjectSP
> -        GetChildAtIndex (uint32_t idx);
> +        GetChildAtIndex (size_t idx);
>
>          virtual bool
>          Update()
> @@ -911,7 +911,7 @@
>      }
>
>      int
> -    GetRealIndexForIndex(int i);
> +    GetRealIndexForIndex(size_t i);
>
>      bool
>      IsScripted()
> @@ -939,7 +939,7 @@
>          {
>          }
>
> -        virtual uint32_t
> +        virtual size_t
>          CalculateNumChildren()
>          {
>              return filter->GetCount();
> @@ -952,7 +952,7 @@
>          }
>
>          virtual lldb::ValueObjectSP
> -        GetChildAtIndex (uint32_t idx)
> +        GetChildAtIndex (size_t idx)
>          {
>              if (idx >= filter->GetCount())
>                  return lldb::ValueObjectSP();
>
> Modified: lldb/trunk/include/lldb/Core/FormatManager.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatManager.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/FormatManager.h (original)
> +++ lldb/trunk/include/lldb/Core/FormatManager.h Fri Jan 25 12:06:21 2013
> @@ -150,7 +150,7 @@
>  #endif
>
>      lldb::TypeNameSpecifierImplSP
> -    GetTypeNameSpecifierForSummaryAtIndex (uint32_t index)
> +    GetTypeNameSpecifierForSummaryAtIndex (size_t index)
>      {
>          if (index < m_summary_nav->GetCount())
>              return m_summary_nav->GetTypeNameSpecifierAtIndex(index);
> @@ -159,7 +159,7 @@
>      }
>
>      SummaryNavigator::MapValueType
> -    GetSummaryAtIndex (uint32_t index)
> +    GetSummaryAtIndex (size_t index)
>      {
>          if (index < m_summary_nav->GetCount())
>              return m_summary_nav->GetAtIndex(index);
> @@ -168,7 +168,7 @@
>      }
>
>      FilterNavigator::MapValueType
> -    GetFilterAtIndex (uint32_t index)
> +    GetFilterAtIndex (size_t index)
>      {
>          if (index < m_filter_nav->GetCount())
>              return m_filter_nav->GetAtIndex(index);
> @@ -177,7 +177,7 @@
>      }
>
>      lldb::TypeNameSpecifierImplSP
> -    GetTypeNameSpecifierForFilterAtIndex (uint32_t index)
> +    GetTypeNameSpecifierForFilterAtIndex (size_t index)
>      {
>          if (index < m_filter_nav->GetCount())
>              return m_filter_nav->GetTypeNameSpecifierAtIndex(index);
> @@ -199,7 +199,7 @@
>      }
>
>      SynthNavigator::MapValueType
> -    GetSyntheticAtIndex (uint32_t index)
> +    GetSyntheticAtIndex (size_t index)
>      {
>          if (index < m_synth_nav->GetCount())
>              return m_synth_nav->GetAtIndex(index);
> @@ -208,7 +208,7 @@
>      }
>
>      lldb::TypeNameSpecifierImplSP
> -    GetTypeNameSpecifierForSyntheticAtIndex (uint32_t index)
> +    GetTypeNameSpecifierForSyntheticAtIndex (size_t index)
>      {
>          if (index < m_synth_nav->GetCount())
>              return m_synth_nav->GetTypeNameSpecifierAtIndex(index);
> @@ -486,7 +486,7 @@
>      LoopThrough (CallbackType callback, void* param);
>
>      lldb::TypeCategoryImplSP
> -    GetAtIndex (uint32_t);
> +    GetAtIndex (size_t index);
>
>      bool
>      AnyMatches (ConstString type_name,
> @@ -495,7 +495,7 @@
>                  const char** matching_category = NULL,
>                  TypeCategoryImpl::FormatCategoryItems* matching_type =
> NULL);
>
> -    uint32_t
> +    size_t
>      GetCount ()
>      {
>          return m_map.size();
> @@ -615,14 +615,14 @@
>          return m_categories_map.Clear();
>      }
>
> -    uint32_t
> +    size_t
>      GetCategoriesCount ()
>      {
>          return m_categories_map.GetCount();
>      }
>
>      lldb::TypeCategoryImplSP
> -    GetCategoryAtIndex (uint32_t index)
> +    GetCategoryAtIndex (size_t index)
>      {
>          return m_categories_map.GetAtIndex(index);
>      }
>
> Modified: lldb/trunk/include/lldb/Core/FormatNavigator.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatNavigator.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/FormatNavigator.h (original)
> +++ lldb/trunk/include/lldb/Core/FormatNavigator.h Fri Jan 25 12:06:21 2013
> @@ -185,14 +185,14 @@
>          }
>      }
>
> -    uint32_t
> +    size_t
>      GetCount ()
>      {
>          return m_map.size();
>      }
>
>      ValueSP
> -    GetValueAtIndex (uint32_t index)
> +    GetValueAtIndex (size_t index)
>      {
>          Mutex::Locker locker(m_map_mutex);
>          MapIterator iter = m_map.begin();
> @@ -208,7 +208,7 @@
>      }
>
>      KeyType
> -    GetKeyAtIndex (uint32_t index)
> +    GetKeyAtIndex (size_t index)
>      {
>          Mutex::Locker locker(m_map_mutex);
>          MapIterator iter = m_map.begin();
> @@ -316,13 +316,13 @@
>      }
>
>      MapValueType
> -    GetAtIndex (uint32_t index)
> +    GetAtIndex (size_t index)
>      {
>          return m_format_map.GetValueAtIndex(index);
>      }
>
>      lldb::TypeNameSpecifierImplSP
> -    GetTypeNameSpecifierAtIndex (uint32_t index)
> +    GetTypeNameSpecifierAtIndex (size_t index)
>      {
>          return GetTypeNameSpecifierAtIndex_Impl(index, (KeyType*)NULL);
>      }
> @@ -339,7 +339,7 @@
>          m_format_map.LoopThrough(callback,param);
>      }
>
> -    uint32_t
> +    size_t
>      GetCount ()
>      {
>          return m_format_map.GetCount();
> @@ -405,7 +405,7 @@
>      }
>
>      lldb::TypeNameSpecifierImplSP
> -    GetTypeNameSpecifierAtIndex_Impl (uint32_t index, ConstString *dummy)
> +    GetTypeNameSpecifierAtIndex_Impl (size_t index, ConstString *dummy)
>      {
>          ConstString key = m_format_map.GetKeyAtIndex(index);
>          if (key)
> @@ -416,7 +416,7 @@
>      }
>
>      lldb::TypeNameSpecifierImplSP
> -    GetTypeNameSpecifierAtIndex_Impl (uint32_t index,
> lldb::RegularExpressionSP *dummy)
> +    GetTypeNameSpecifierAtIndex_Impl (size_t index,
> lldb::RegularExpressionSP *dummy)
>      {
>          lldb::RegularExpressionSP regex =
> m_format_map.GetKeyAtIndex(index);
>          if (regex.get() == NULL)
>
> Modified: lldb/trunk/include/lldb/Core/MappedHash.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/MappedHash.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/MappedHash.h (original)
> +++ lldb/trunk/include/lldb/Core/MappedHash.h Fri Jan 25 12:06:21 2013
> @@ -36,7 +36,7 @@
>      }
>
>      static uint32_t
> -    HashString (const uint8_t hash_function, const char *s)
> +    HashString (uint32_t hash_function, const char *s)
>      {
>          switch (hash_function)
>          {
> @@ -115,8 +115,8 @@
>              s.Printf ("header.header_data_len    = 0x%8.8x %u\n",
> header_data_len, header_data_len);
>          }
>
> -        virtual uint32_t
> -        Read (lldb_private::DataExtractor &data, uint32_t offset)
> +        virtual lldb::offset_t
> +        Read (lldb_private::DataExtractor &data, lldb::offset_t offset)
>          {
>              if (data.ValidOffsetForDataOfSize (offset,
>                                                 sizeof (magic) +
> @@ -140,14 +140,14 @@
>                                  data.SetByteOrder(lldb::eByteOrderBig);
>                                  break;
>                              default:
> -                                return UINT32_MAX;
> +                                return LLDB_INVALID_OFFSET;
>                          }
>                      }
>                      else
>                      {
>                          // Magic bytes didn't match
>                          version = 0;
> -                        return UINT32_MAX;
> +                        return LLDB_INVALID_OFFSET;
>                      }
>                  }
>
> @@ -155,7 +155,7 @@
>                  if (version != 1)
>                  {
>                      // Unsupported version
> -                    return UINT32_MAX;
> +                    return LLDB_INVALID_OFFSET;
>                  }
>                  hash_function       = data.GetU16 (&offset);
>                  if (hash_function == 4)
> @@ -165,7 +165,7 @@
>                  header_data_len     = data.GetU32 (&offset);
>                  return offset;
>              }
> -            return UINT32_MAX;
> +            return LLDB_INVALID_OFFSET;
>          }
>  //
>  //        // Returns a buffer that contains a serialized version of this
> table
> @@ -379,8 +379,8 @@
>              m_hash_values (NULL),
>              m_hash_offsets (NULL)
>          {
> -            uint32_t offset = m_header.Read (data, 0);
> -            if (offset != UINT32_MAX && IsValid ())
> +            lldb::offset_t offset = m_header.Read (data, 0);
> +            if (offset != LLDB_INVALID_OFFSET && IsValid ())
>              {
>                  m_hash_indexes = (uint32_t *)data.GetData (&offset,
> m_header.bucket_count * sizeof(uint32_t));
>                  m_hash_values  = (uint32_t *)data.GetData (&offset,
> m_header.hashes_count * sizeof(uint32_t));
> @@ -443,10 +443,10 @@
>                          const uint32_t curr_hash_value = GetHashValue
> (hash_idx);
>                          if (curr_hash_value == hash_value)
>                          {
> -                            uint32_t hash_data_offset = GetHashDataOffset
> (hash_idx);
> +                            lldb::offset_t hash_data_offset =
> GetHashDataOffset (hash_idx);
>                              while (hash_data_offset != UINT32_MAX)
>                              {
> -                                const uint32_t prev_hash_data_offset =
> hash_data_offset;
> +                                const lldb::offset_t
> prev_hash_data_offset = hash_data_offset;
>                                  Result hash_result = GetHashDataForName
> (name, &hash_data_offset, pair);
>                                  // Check the result of getting our hash
> data
>                                  switch (hash_result)
> @@ -505,7 +505,7 @@
>
>          virtual Result
>          GetHashDataForName (const char *name,
> -                            uint32_t* hash_data_offset_ptr,
> +                            lldb::offset_t* hash_data_offset_ptr,
>                              Pair &pair) const = 0;
>
>          const HeaderType &
>
> Modified: lldb/trunk/include/lldb/Core/Module.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Module.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/Module.h (original)
> +++ lldb/trunk/include/lldb/Core/Module.h Fri Jan 25 12:06:21 2013
> @@ -247,7 +247,7 @@
>      /// @return
>      ///     The number of matches added to \a sc_list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindCompileUnits (const FileSpec &path,
>                        bool append,
>                        SymbolContextList &sc_list);
> @@ -284,7 +284,7 @@
>      /// @return
>      ///     The number of matches added to \a sc_list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindFunctions (const ConstString &name,
>                     const ClangNamespaceDecl *namespace_decl,
>                     uint32_t name_type_mask,
> @@ -315,7 +315,7 @@
>      /// @return
>      ///     The number of matches added to \a sc_list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindFunctions (const RegularExpression& regex,
>                     bool symbols_ok,
>                     bool inlines_ok,
> @@ -348,11 +348,11 @@
>      /// @return
>      ///     The number of matches added to \a variable_list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindGlobalVariables (const ConstString &name,
>                           const ClangNamespaceDecl *namespace_decl,
>                           bool append,
> -                         uint32_t max_matches,
> +                         size_t max_matches,
>                           VariableList& variable_list);
>
>      //------------------------------------------------------------------
> @@ -377,10 +377,10 @@
>      /// @return
>      ///     The number of matches added to \a variable_list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindGlobalVariables (const RegularExpression& regex,
>                           bool append,
> -                         uint32_t max_matches,
> +                         size_t max_matches,
>                           VariableList& variable_list);
>
>      //------------------------------------------------------------------
> @@ -424,11 +424,11 @@
>      /// @return
>      ///     The number of matches added to \a type_list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindTypes (const SymbolContext& sc,
>                 const ConstString &type_name,
>                 bool exact_match,
> -               uint32_t max_matches,
> +               size_t max_matches,
>                 TypeList& types);
>
>      lldb::TypeSP
> @@ -458,11 +458,11 @@
>      /// @return
>      ///     The number of matches added to \a type_list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindTypesInNamespace (const SymbolContext& sc,
>                            const ConstString &type_name,
>                            const ClangNamespaceDecl *namespace_decl,
> -                          uint32_t max_matches,
> +                          size_t max_matches,
>                            TypeList& type_list);
>
>      //------------------------------------------------------------------
> @@ -570,11 +570,11 @@
>      ///     The number of compile units that the symbol vendor plug-in
>      ///     finds.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      GetNumCompileUnits();
>
>      lldb::CompUnitSP
> -    GetCompileUnitAtIndex (uint32_t);
> +    GetCompileUnitAtIndex (size_t idx);
>
>      const ConstString &
>      GetObjectName() const;
> @@ -963,12 +963,12 @@
>
>  private:
>
> -    uint32_t
> +    size_t
>      FindTypes_Impl (const SymbolContext& sc,
>                      const ConstString &name,
>                      const ClangNamespaceDecl *namespace_decl,
>                      bool append,
> -                    uint32_t max_matches,
> +                    size_t max_matches,
>                      TypeList& types);
>
>
>
> Modified: lldb/trunk/include/lldb/Core/ModuleList.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ModuleList.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/ModuleList.h (original)
> +++ lldb/trunk/include/lldb/Core/ModuleList.h Fri Jan 25 12:06:21 2013
> @@ -165,7 +165,7 @@
>          return m_modules_mutex;
>      }
>
> -    uint32_t
> +    size_t
>      GetIndexForModule (const Module *module) const;
>
>      //------------------------------------------------------------------
> @@ -181,7 +181,7 @@
>      /// @see ModuleList::GetSize()
>      //------------------------------------------------------------------
>      lldb::ModuleSP
> -    GetModuleAtIndex (uint32_t idx) const;
> +    GetModuleAtIndex (size_t idx) const;
>
>      //------------------------------------------------------------------
>      /// Get the module shared pointer for the module at index \a idx
> without
> @@ -198,7 +198,7 @@
>      /// @see ModuleList::GetSize()
>      //------------------------------------------------------------------
>      lldb::ModuleSP
> -    GetModuleAtIndexUnlocked (uint32_t idx) const;
> +    GetModuleAtIndexUnlocked (size_t idx) const;
>
>      //------------------------------------------------------------------
>      /// Get the module pointer for the module at index \a idx.
> @@ -213,7 +213,7 @@
>      /// @see ModuleList::GetSize()
>      //------------------------------------------------------------------
>      Module*
> -    GetModulePointerAtIndex (uint32_t idx) const;
> +    GetModulePointerAtIndex (size_t idx) const;
>
>      //------------------------------------------------------------------
>      /// Get the module pointer for the module at index \a idx without
> @@ -230,7 +230,7 @@
>      /// @see ModuleList::GetSize()
>      //------------------------------------------------------------------
>      Module*
> -    GetModulePointerAtIndexUnlocked (uint32_t idx) const;
> +    GetModulePointerAtIndexUnlocked (size_t idx) const;
>
>      //------------------------------------------------------------------
>      /// Find compile units by partial or full path.
> @@ -253,7 +253,7 @@
>      /// @return
>      ///     The number of matches added to \a sc_list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindCompileUnits (const FileSpec &path,
>                        bool append,
>                        SymbolContextList &sc_list) const;
> @@ -261,7 +261,7 @@
>      //------------------------------------------------------------------
>      /// @see Module::FindFunctions ()
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindFunctions (const ConstString &name,
>                     uint32_t name_type_mask,
>                     bool include_symbols,
> @@ -292,10 +292,10 @@
>      /// @return
>      ///     The number of matches added to \a variable_list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindGlobalVariables (const ConstString &name,
>                           bool append,
> -                         uint32_t max_matches,
> +                         size_t max_matches,
>                           VariableList& variable_list) const;
>
>      //------------------------------------------------------------------
> @@ -320,10 +320,10 @@
>      /// @return
>      ///     The number of matches added to \a variable_list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindGlobalVariables (const RegularExpression& regex,
>                           bool append,
> -                         uint32_t max_matches,
> +                         size_t max_matches,
>                           VariableList& variable_list) const;
>
>      //------------------------------------------------------------------
> @@ -422,11 +422,11 @@
>      /// @return
>      ///     The number of matches added to \a type_list.
>      //------------------------------------------------------------------
> -    uint32_t
> +    size_t
>      FindTypes (const SymbolContext& sc,
>                 const ConstString &name,
>                 bool name_is_fully_qualified,
> -               uint32_t max_matches,
> +               size_t max_matches,
>                 TypeList& types) const;
>
>      bool
> @@ -503,7 +503,7 @@
>      FindSharedModules (const ModuleSpec &module_spec,
>                         ModuleList &matching_module_list);
>
> -    static uint32_t
> +    static size_t
>      RemoveOrphanSharedModules (bool mandatory);
>
>      static bool
>
> Modified: lldb/trunk/include/lldb/Core/PluginManager.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/PluginManager.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/PluginManager.h (original)
> +++ lldb/trunk/include/lldb/Core/PluginManager.h Fri Jan 25 12:06:21 2013
> @@ -216,7 +216,7 @@
>      static const char *
>      GetPlatformPluginDescriptionAtIndex (uint32_t idx);
>
> -    static uint32_t
> +    static size_t
>      AutoCompletePlatformName (const char *partial_name,
>                                StringList &matches);
>      //------------------------------------------------------------------
>
> Modified: lldb/trunk/include/lldb/Core/RegisterValue.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/RegisterValue.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/RegisterValue.h (original)
> +++ lldb/trunk/include/lldb/Core/RegisterValue.h Fri Jan 25 12:06:21 2013
> @@ -345,7 +345,7 @@
>          Error
>          SetValueFromData (const RegisterInfo *reg_info,
>                            DataExtractor &data,
> -                          uint32_t offset,
> +                          lldb::offset_t offset,
>                            bool partial_data_ok);
>
>          // The default value of 0 for reg_name_right_align_at means no
> alignment at all.
>
> Modified: lldb/trunk/include/lldb/Core/Scalar.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Scalar.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/Scalar.h (original)
> +++ lldb/trunk/include/lldb/Core/Scalar.h Fri Jan 25 12:06:21 2013
> @@ -73,9 +73,9 @@
>      bool
>      GetData (DataExtractor &data, size_t limit_byte_size = UINT32_MAX)
> const;
>
> -    uint32_t
> +    size_t
>      GetAsMemoryData (void *dst,
> -                     uint32_t dst_len,
> +                     size_t dst_len,
>                       lldb::ByteOrder dst_byte_order,
>                       Error &error) const;
>
> @@ -219,7 +219,7 @@
>      GetRawBits64 (uint64_t fail_value) const;
>
>      Error
> -    SetValueFromCString (const char *s, lldb::Encoding encoding, uint32_t
> byte_size);
> +    SetValueFromCString (const char *s, lldb::Encoding encoding, size_t
> byte_size);
>
>      static bool
>      UIntValueIsValidForSize (uint64_t uval64, size_t total_byte_size)
> @@ -249,6 +249,16 @@
>      }
>
>  protected:
> +    typedef int                 sint_t;
> +    typedef unsigned int        uint_t;
> +    typedef long                slong_t;
> +    typedef unsigned long       ulong_t;
> +    typedef long long           slonglong_t;
> +    typedef unsigned long long  ulonglong_t;
> +    typedef float               float_t;
> +    typedef double              double_t;
> +    typedef long double         long_double_t;
> +
>      union ValueData
>      {
>          int                 sint;
>
> Modified: lldb/trunk/include/lldb/Core/Section.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Section.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/Section.h (original)
> +++ lldb/trunk/include/lldb/Core/Section.h Fri Jan 25 12:06:21 2013
> @@ -34,13 +34,13 @@
>      virtual
>      ~SectionList();
>
> -    uint32_t
> +    size_t
>      AddSection (const lldb::SectionSP& section_sp);
>
> -    uint32_t
> +    size_t
>      AddUniqueSection (const lldb::SectionSP& section_sp);
>
> -    uint32_t
> +    size_t
>      FindSectionIndex (const Section* sect);
>
>      bool
> @@ -56,7 +56,7 @@
>      FindSectionByID (lldb::user_id_t sect_id) const;
>
>      lldb::SectionSP
> -    FindSectionByType (lldb::SectionType sect_type, bool check_children,
> uint32_t start_idx = 0) const;
> +    FindSectionByType (lldb::SectionType sect_type, bool check_children,
> size_t start_idx = 0) const;
>
>      lldb::SectionSP
>      FindSectionContainingFileAddress (lldb::addr_t addr, uint32_t depth =
> UINT32_MAX) const;
> @@ -82,7 +82,7 @@
>      ReplaceSection (lldb::user_id_t sect_id, const lldb::SectionSP&
> section_sp, uint32_t depth = UINT32_MAX);
>
>      lldb::SectionSP
> -    GetSectionAtIndex (uint32_t idx) const;
> +    GetSectionAtIndex (size_t idx) const;
>
>      size_t
>      Slide (lldb::addr_t slide_amount, bool slide_children);
>
> Modified: lldb/trunk/include/lldb/Core/Stream.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Stream.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/Stream.h (original)
> +++ lldb/trunk/include/lldb/Core/Stream.h Fri Jan 25 12:06:21 2013
> @@ -87,13 +87,13 @@
>      /// @return
>      ///     The number of bytes that were appended to the stream.
>      //------------------------------------------------------------------
> -    virtual int
> +    virtual size_t
>      Write (const void *src, size_t src_len) = 0;
>
>      //------------------------------------------------------------------
>      // Member functions
>      //------------------------------------------------------------------
> -    int
> +    size_t
>      PutChar (char ch);
>
>      //------------------------------------------------------------------
> @@ -125,7 +125,7 @@
>      /// @return
>      ///     The number of bytes that were appended to the stream.
>      //------------------------------------------------------------------
> -    int
> +    size_t
>      PrintfAsRawHex8 (const char *format, ...)  __attribute__ ((format
> (printf, 2, 3)));
>
>      //------------------------------------------------------------------
> @@ -142,59 +142,59 @@
>      /// @return
>      ///     The number of bytes that were appended to the stream.
>      //------------------------------------------------------------------
> -    int
> +    size_t
>      PutHex8 (uint8_t uvalue);
>
> -    int
> +    size_t
>      PutNHex8 (size_t n, uint8_t uvalue);
>
> -    int
> +    size_t
>      PutHex16 (uint16_t uvalue,
>                lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);
>
> -    int
> +    size_t
>      PutHex32 (uint32_t uvalue,
>                lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);
>
> -    int
> +    size_t
>      PutHex64 (uint64_t uvalue,
>                lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);
>
> -    int
> +    size_t
>      PutMaxHex64 (uint64_t uvalue,
>                   size_t byte_size,
>                   lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);
> -    int
> +    size_t
>      PutFloat (float f,
>                lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);
>
> -    int
> +    size_t
>      PutDouble (double d,
>                 lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);
>
> -    int
> +    size_t
>      PutLongDouble (long double ld,
>                     lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);
>
> -    int
> +    size_t
>      PutPointer (void *ptr);
>
>      // Append \a src_len bytes from \a src to the stream as hex characters
>      // (two ascii characters per byte of input data)
> -    int
> +    size_t
>      PutBytesAsRawHex8 (const void *src,
>                         size_t src_len,
>                         lldb::ByteOrder src_byte_order =
> lldb::eByteOrderInvalid,
>                         lldb::ByteOrder dst_byte_order =
> lldb::eByteOrderInvalid);
>
>      // Append \a src_len bytes from \a s to the stream as binary data.
> -    int
> +    size_t
>      PutRawBytes (const void *s,
>                   size_t src_len,
>                   lldb::ByteOrder src_byte_order = lldb::eByteOrderInvalid,
>                   lldb::ByteOrder dst_byte_order =
> lldb::eByteOrderInvalid);
>
> -    int
> +    size_t
>      PutCStringAsRawHex8 (const char *s);
>
>      //------------------------------------------------------------------
> @@ -359,7 +359,7 @@
>      ///     A suffix C string. If NULL, no suffix will be output.
>      //------------------------------------------------------------------
>      void
> -    Address (uint64_t addr, int addr_size, const char *prefix = NULL,
> const char *suffix = NULL);
> +    Address (uint64_t addr, uint32_t addr_size, const char *prefix =
> NULL, const char *suffix = NULL);
>
>      //------------------------------------------------------------------
>      /// Output an address range to this stream.
> @@ -383,7 +383,7 @@
>      ///     A suffix C string. If NULL, no suffix will be output.
>      //------------------------------------------------------------------
>      void
> -    AddressRange(uint64_t lo_addr, uint64_t hi_addr, int addr_size, const
> char *prefix = NULL, const char *suffix = NULL);
> +    AddressRange(uint64_t lo_addr, uint64_t hi_addr, uint32_t addr_size,
> const char *prefix = NULL, const char *suffix = NULL);
>
>      //------------------------------------------------------------------
>      /// Output a C string to the stream.
> @@ -393,13 +393,13 @@
>      /// @param[in] cstr
>      ///     The string to be output to the stream.
>      //------------------------------------------------------------------
> -    int
> +    size_t
>      PutCString (const char *cstr);
>
>      //------------------------------------------------------------------
>      /// Output and End of Line character to the stream.
>      //------------------------------------------------------------------
> -    int
> +    size_t
>      EOL();
>
>      //------------------------------------------------------------------
> @@ -409,7 +409,7 @@
>      ///     The size of an address in bytes that is used when outputting
>      ///     address and pointer values to the stream.
>      //------------------------------------------------------------------
> -    uint8_t
> +    uint32_t
>      GetAddressByteSize () const;
>
>      //------------------------------------------------------------------
> @@ -478,7 +478,7 @@
>      ///     A C string to print following the indentation. If NULL, just
>      ///     output the indentation characters.
>      //------------------------------------------------------------------
> -    int
> +    size_t
>      Indent(const char *s = NULL);
>
>      //------------------------------------------------------------------
> @@ -520,10 +520,10 @@
>      ///     Variable arguments that are needed for the printf style
>      ///     format string \a format.
>      //------------------------------------------------------------------
> -    int
> +    size_t
>      Printf (const char *format, ...)  __attribute__ ((format (printf, 2,
> 3)));
>
> -    int
> +    size_t
>      PrintfVarArg(const char *format, va_list args);
>
>      //------------------------------------------------------------------
> @@ -549,7 +549,7 @@
>      ///     address and pointer values.
>      //------------------------------------------------------------------
>      void
> -    SetAddressByteSize (uint8_t addr_size);
> +    SetAddressByteSize (uint32_t addr_size);
>
>      //------------------------------------------------------------------
>      /// Set the current indentation level.
> @@ -572,7 +572,7 @@
>      /// @param[in] format
>      ///     The optional printf format that can be overridden.
>      //------------------------------------------------------------------
> -    int
> +    size_t
>      PutSLEB128 (int64_t uval);
>
>      //------------------------------------------------------------------
> @@ -587,7 +587,7 @@
>      /// @param[in] format
>      ///     The optional printf format that can be overridden.
>      //------------------------------------------------------------------
> -    int
> +    size_t
>      PutULEB128 (uint64_t uval);
>
>      static void
> @@ -597,12 +597,12 @@
>      //------------------------------------------------------------------
>      // Member variables
>      //------------------------------------------------------------------
> -    Flags m_flags;      ///< Dump flags.
> -    uint8_t m_addr_size;    ///< Size of an address in bytes.
> -    lldb::ByteOrder m_byte_order;///< Byte order to use when encoding
> scalar types.
> -    int m_indent_level;     ///< Indention level.
> +    Flags m_flags;                  ///< Dump flags.
> +    uint32_t m_addr_size;           ///< Size of an address in bytes.
> +    lldb::ByteOrder m_byte_order;   ///< Byte order to use when encoding
> scalar types.
> +    int m_indent_level;             ///< Indention level.
>
> -    int _PutHex8 (uint8_t uvalue, bool add_prefix);
> +    size_t _PutHex8 (uint8_t uvalue, bool add_prefix);
>  };
>
>  } // namespace lldb_private
>
> Modified: lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h (original)
> +++ lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h Fri Jan 25
> 12:06:21 2013
> @@ -28,7 +28,7 @@
>      virtual void
>      Flush ();
>
> -    virtual int
> +    virtual size_t
>      Write (const void *src, size_t src_len);
>
>
>
> Modified: lldb/trunk/include/lldb/Core/StreamBuffer.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamBuffer.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/StreamBuffer.h (original)
> +++ lldb/trunk/include/lldb/Core/StreamBuffer.h Fri Jan 25 12:06:21 2013
> @@ -47,7 +47,7 @@
>          // Nothing to do when flushing a buffer based stream...
>      }
>
> -    virtual int
> +    virtual size_t
>      Write (const void *s, size_t length)
>      {
>          if (s && length)
>
> Modified: lldb/trunk/include/lldb/Core/StreamCallback.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamCallback.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/StreamCallback.h (original)
> +++ lldb/trunk/include/lldb/Core/StreamCallback.h Fri Jan 25 12:06:21 2013
> @@ -29,7 +29,7 @@
>      virtual void
>      Flush ();
>
> -    virtual int
> +    virtual size_t
>      Write (const void *src, size_t src_len);
>
>
>
> Modified: lldb/trunk/include/lldb/Core/StreamFile.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamFile.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/StreamFile.h (original)
> +++ lldb/trunk/include/lldb/Core/StreamFile.h Fri Jan 25 12:06:21 2013
> @@ -57,7 +57,7 @@
>      virtual void
>      Flush ();
>
> -    virtual int
> +    virtual size_t
>      Write (const void *s, size_t length);
>
>  protected:
>
> Modified: lldb/trunk/include/lldb/Core/StreamString.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamString.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/StreamString.h (original)
> +++ lldb/trunk/include/lldb/Core/StreamString.h Fri Jan 25 12:06:21 2013
> @@ -31,7 +31,7 @@
>      virtual void
>      Flush ();
>
> -    virtual int
> +    virtual size_t
>      Write (const void *s, size_t length);
>
>      void
>
> Modified: lldb/trunk/include/lldb/Core/StreamTee.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamTee.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/StreamTee.h (original)
> +++ lldb/trunk/include/lldb/Core/StreamTee.h Fri Jan 25 12:06:21 2013
> @@ -93,14 +93,14 @@
>          }
>      }
>
> -    virtual int
> +    virtual size_t
>      Write (const void *s, size_t length)
>      {
>          Mutex::Locker locker (m_streams_mutex);
>          if (m_streams.empty())
>              return 0;
>
> -        int min_bytes_written = INT_MAX;
> +        size_t min_bytes_written = SIZE_MAX;
>          collection::iterator pos, end;
>          for (pos = m_streams.begin(), end = m_streams.end(); pos != end;
> ++pos)
>          {
> @@ -111,11 +111,13 @@
>              Stream *strm = pos->get();
>              if (strm)
>              {
> -                int bytes_written = strm->Write (s, length);
> +                const size_t bytes_written = strm->Write (s, length);
>                  if (min_bytes_written > bytes_written)
>                      min_bytes_written = bytes_written;
>              }
>          }
> +        if (min_bytes_written == SIZE_MAX)
> +            return 0;
>          return min_bytes_written;
>      }
>
>
> Modified: lldb/trunk/include/lldb/Core/StringList.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StringList.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/StringList.h (original)
> +++ lldb/trunk/include/lldb/Core/StringList.h Fri Jan 25 12:06:21 2013
> @@ -48,7 +48,7 @@
>      bool
>      ReadFileLines (FileSpec &input_file);
>
> -    uint32_t
> +    size_t
>      GetSize () const;
>
>      const char *
>
> Modified: lldb/trunk/include/lldb/Core/VMRange.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/VMRange.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/VMRange.h (original)
> +++ lldb/trunk/include/lldb/Core/VMRange.h Fri Jan 25 12:06:21 2013
> @@ -161,7 +161,7 @@
>
>      // Returns a valid index into coll when a match is found, else
> UINT32_MAX
>      // is returned
> -    static uint32_t
> +    static size_t
>      FindRangeIndexThatContainsValue (const VMRange::collection& coll,
> lldb::addr_t value);
>
>  protected:
>
> Modified: lldb/trunk/include/lldb/Core/Value.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Value.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/Value.h (original)
> +++ lldb/trunk/include/lldb/Core/Value.h Fri Jan 25 12:06:21 2013
> @@ -213,7 +213,7 @@
>      }
>
>      void
> -    ResizeData(int len);
> +    ResizeData(size_t len);
>
>      bool
>      ValueOf(ExecutionContext *exe_ctx, clang::ASTContext *ast_context);
>
> Modified: lldb/trunk/include/lldb/Core/ValueObject.h
> URL:
> http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObject.h?rev=173463&r1=173462&r2=173463&view=diff
>
> ==============================================================================
> --- lldb/trunk/include/lldb/Core/ValueObject.h (original)
> +++ lldb/trunk/include/lldb/Core/ValueObject.h Fri Jan 25 12:06:21 2013
> @@ -732,32 +732,32 @@
>      GetName() const;
>
>      virtual lldb::ValueObjectSP
> -    GetChildAtIndex (uint32_t idx, bool can_create);
> +    GetChildAtIndex (size_t idx, bool can_create);
>
>      // this will always create the children if necessary
>      lldb::ValueObjectSP
> -    GetChildAtIndexPath (const std::initializer_list<uint32_t> &idxs,
> -                         uint32_t* index_of_error = NULL);
> +    GetChildAtIndexPath (const std::initializer_list<size_t> &idxs,
> +                         size_t* index_of_error = NULL);
>
>      lldb::ValueObjectSP
> -    GetChildAtIndexPath (const std::vector<uint32_t> &idxs,
> -                         uint32_t* index_of_error = NULL);
> +    GetChildAtIndexPath (const std::vector<size_t> &idxs,
> +                         size_t* index_of_error = NULL);
>
>      lldb::ValueObjectSP
> -    GetChildAtIndexPath (const std::initializer_list< std::pair<uint32_t,
> bool> > &idxs,
> -                         uint32_t* index_of_error = NULL);
> +    GetChildAtIndexPath (const std::initializer_list< std::pair<size_t,
> bool> > &idxs,
> +                         size_t* index_of_error = NULL);
>
>      lldb::ValueObjectSP
> -    GetChildAtIndexPath (const std::vector< std::pair<uint32_t, bool> >
> &idxs,
> -                         uint32_t* index_of_error = NULL);
> +    GetChildAtIndexPath (const std::vector< std::pair<size_t, bool> >
> &idxs,
> +                         size_t* index_of_error = NULL);
>
>      virtual lldb::ValueObjectSP
>      GetChildMemberWithName (const ConstString &name, bool can_create);
>
> -    virtual uint32_t
> +    virtual size_t
>      GetIndexOfChildWithName (const ConstString &name);
>
> -    uint32_t
> +    size_t
>      GetNumChildren ();
>
>      const Value &
> @@ -833,13 +833,13 @@
>      GetSyntheticChild (const ConstString &key) const;
>
>      lldb::ValueObjectSP
> -    GetSyntheticArrayMember (int32_t index, bool can_create);
> +    GetSyntheticArrayMember (size_t index, bool can_create);
>
>      lldb::ValueObjectSP
> -    GetSyntheticArrayMemberFromPointer (int32_t index, bool can_create);
> +    GetSyntheticArrayMemberFromPointer (size_t index, bool can_create);
>
>      lldb::ValueObjectSP
> -    GetSyntheticArrayMemberFromArray (int32_t index, bool can_create);
> +    GetSyntheticArrayMemberFromArray (size_t index, bool can_create);
>
>      lldb::ValueObjectSP
>      GetSyntheticBitFieldChild (uint32_t from, uint32_t to, bool
> can_create);
> @@ -1117,13 +1117,13 @@
>      {
>      public:
>          ChildrenManager() :
> -        m_mutex(Mutex::eMutexTypeRecursive),
> -        m_children(),
> -        m_children_count(0)
> +            m_mutex(Mutex::eMutexTypeRecursive),
> +            m_children(),
> +            m_children_count(0)
>          {}
>
>          bool
> -        HasChildAtIndex (uint32_t idx)
> +        HasChildAtIndex (size_t idx)
>          {
>              Mutex::Locker locker(m_mutex);
>              ChildrenIterator iter = m_children.find(idx);
> @@ -1132,7 +1132,7 @@
>          }
>
>          ValueObject*
> -        GetChildAtIndex (uint32_t idx)
> +        GetChildAtIndex (size_t idx)
>          {
>              Mutex::Locker locker(m_mutex);
>              ChildrenIterator iter = m_children.find(idx);
> @@ -1144,7 +1144,7 @@
>          }
>
>          void
> -        SetChildAtIndex (uint32_t idx, ValueObject* valobj)
> +        SetChildAtIndex (size_t idx, ValueObject* valobj)
>          {
>              ChildrenPair pair(idx,valobj); // we do not need to be
> mutex-protected to make a pair
>              Mutex::Locker locker(m_mutex);
> @@ -1152,12 +1152,12 @@
>          }
>
>          void
> -        SetChildrenCount (uint32_t count)
> +        SetChildrenCount (size_t count)
>          {
>              m_children_count = count;
>          }
>
> -        uint32_t
> +        size_t
>          GetChildrenCount ()
>          {
>              return m_children_count;
> @@ -1172,12 +1172,12 @@
>          }
>
>      private:
> -        typedef std::map<uint32_t, ValueObject*> ChildrenMap;
> +        typedef std::map<size_t, ValueObject*> ChildrenMap;
>          typedef ChildrenMap::iterator ChildrenIterator;
>          typedef ChildrenMap::value_type ChildrenPair;
>          Mutex m_mutex;
>          ChildrenMap m_children;
> -        uint32_t m_children_count;
> +        size_t m_children_count;
>      };
>
>      //-----------------------------------------------------...
>
> [Message clipped]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20130125/34cd99b3/attachment.html>


More information about the lldb-commits mailing list