<div dir="ltr">Hi Greg.<div><br></div><div><span style="font-family:arial,sans-serif;font-size:13px">Modified: lldb/trunk/include/lldb/</span><span style="font-family:arial,sans-serif;font-size:13px">Breakpoint/Watchpoint.h</span><br style="font-family:arial,sans-serif;font-size:13px">
<span style="font-family:arial,sans-serif;font-size:13px">URL: </span><a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Watchpoint.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank" style="font-family:arial,sans-serif;font-size:13px">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Watchpoint.h?rev=173463&r1=173462&r2=173463&view=diff</a><br style="font-family:arial,sans-serif;font-size:13px">
<span style="font-family:arial,sans-serif;font-size:13px">==============================</span><span style="font-family:arial,sans-serif;font-size:13px">==============================</span><span style="font-family:arial,sans-serif;font-size:13px">==================</span><br style="font-family:arial,sans-serif;font-size:13px">
<span style="font-family:arial,sans-serif;font-size:13px">--- lldb/trunk/include/lldb/</span><span style="font-family:arial,sans-serif;font-size:13px">Breakpoint/Watchpoint.h (original)</span><br style="font-family:arial,sans-serif;font-size:13px">
<span style="font-family:arial,sans-serif;font-size:13px">+++ lldb/trunk/include/lldb/</span><span style="font-family:arial,sans-serif;font-size:13px">Breakpoint/Watchpoint.h Fri Jan 25 12:06:21 2013</span><br style="font-family:arial,sans-serif;font-size:13px">
<span style="font-family:arial,sans-serif;font-size:13px">@@ -76,7 +76,7 @@</span><br style="font-family:arial,sans-serif;font-size:13px"><span style="font-family:arial,sans-serif;font-size:13px">         DISALLOW_COPY_AND_ASSIGN (WatchpointEventData);</span><br style="font-family:arial,sans-serif;font-size:13px">
<span style="font-family:arial,sans-serif;font-size:13px">     };</span><br style="font-family:arial,sans-serif;font-size:13px"><br style="font-family:arial,sans-serif;font-size:13px"><span style="font-family:arial,sans-serif;font-size:13px">-    Watchpoint (Target& target, lldb::addr_t addr, size_t size, const ClangASTType *type, bool hardware = true);</span><br style="font-family:arial,sans-serif;font-size:13px">
<span style="font-family:arial,sans-serif;font-size:13px">+    Watchpoint (Target& target, lldb::addr_t addr, uint32_t size, const ClangASTType *type, bool hardware = true);</span><br style="font-family:arial,sans-serif;font-size:13px">
<span style="font-family:arial,sans-serif;font-size:13px">     ~Watchpoint ();</span><br style="font-family:arial,sans-serif;font-size:13px"><br style="font-family:arial,sans-serif;font-size:13px"><span style="font-family:arial,sans-serif;font-size:13px">     void</span><br style="font-family:arial,sans-serif;font-size:13px">
</div><div><span style="font-family:arial,sans-serif;font-size:13px"><br></span></div><div style><span style="font-family:arial,sans-serif;font-size:13px">Why the reverse change (size_t -> uint32_t) on Watchpoint?</span></div>
<div style><span style="font-family:arial,sans-serif;font-size:13px"><br></span></div><div style><span style="font-family:arial,sans-serif;font-size:13px">Thanks,</span></div><div style><span style="font-family:arial,sans-serif;font-size:13px"><br>
</span></div><div style><span style="font-family:arial,sans-serif;font-size:13px">  Filipe</span></div></div><div class="gmail_extra"><br clear="all"><div>  F<br></div>
<br><br><div class="gmail_quote">On Fri, Jan 25, 2013 at 10:06 AM, Greg Clayton <span dir="ltr"><<a href="mailto:gclayton@apple.com" target="_blank">gclayton@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: gclayton<br>
Date: Fri Jan 25 12:06:21 2013<br>
New Revision: 173463<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=173463&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=173463&view=rev</a><br>
Log:<br>
<rdar://problem/13069948><br>
<br>
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.<br>

<br>
So I defined a new "lldb::offset_t" which should be used for all file offsets.<br>
<br>
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.<br>
<br>
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.<br>
<br>
<br>
Modified:<br>
    lldb/trunk/examples/python/operating_system.py<br>
    lldb/trunk/include/lldb/API/SBData.h<br>
    lldb/trunk/include/lldb/Breakpoint/Breakpoint.h<br>
    lldb/trunk/include/lldb/Breakpoint/BreakpointIDList.h<br>
    lldb/trunk/include/lldb/Breakpoint/BreakpointList.h<br>
    lldb/trunk/include/lldb/Breakpoint/BreakpointLocationCollection.h<br>
    lldb/trunk/include/lldb/Breakpoint/BreakpointLocationList.h<br>
    lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h<br>
    lldb/trunk/include/lldb/Breakpoint/Watchpoint.h<br>
    lldb/trunk/include/lldb/Core/ArchSpec.h<br>
    lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h<br>
    lldb/trunk/include/lldb/Core/DataExtractor.h<br>
    lldb/trunk/include/lldb/Core/Debugger.h<br>
    lldb/trunk/include/lldb/Core/Disassembler.h<br>
    lldb/trunk/include/lldb/Core/FileSpecList.h<br>
    lldb/trunk/include/lldb/Core/FormatClasses.h<br>
    lldb/trunk/include/lldb/Core/FormatManager.h<br>
    lldb/trunk/include/lldb/Core/FormatNavigator.h<br>
    lldb/trunk/include/lldb/Core/MappedHash.h<br>
    lldb/trunk/include/lldb/Core/Module.h<br>
    lldb/trunk/include/lldb/Core/ModuleList.h<br>
    lldb/trunk/include/lldb/Core/PluginManager.h<br>
    lldb/trunk/include/lldb/Core/RegisterValue.h<br>
    lldb/trunk/include/lldb/Core/Scalar.h<br>
    lldb/trunk/include/lldb/Core/Section.h<br>
    lldb/trunk/include/lldb/Core/Stream.h<br>
    lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h<br>
    lldb/trunk/include/lldb/Core/StreamBuffer.h<br>
    lldb/trunk/include/lldb/Core/StreamCallback.h<br>
    lldb/trunk/include/lldb/Core/StreamFile.h<br>
    lldb/trunk/include/lldb/Core/StreamString.h<br>
    lldb/trunk/include/lldb/Core/StreamTee.h<br>
    lldb/trunk/include/lldb/Core/StringList.h<br>
    lldb/trunk/include/lldb/Core/VMRange.h<br>
    lldb/trunk/include/lldb/Core/Value.h<br>
    lldb/trunk/include/lldb/Core/ValueObject.h<br>
    lldb/trunk/include/lldb/Core/ValueObjectCast.h<br>
    lldb/trunk/include/lldb/Core/ValueObjectChild.h<br>
    lldb/trunk/include/lldb/Core/ValueObjectConstResult.h<br>
    lldb/trunk/include/lldb/Core/ValueObjectConstResultChild.h<br>
    lldb/trunk/include/lldb/Core/ValueObjectConstResultImpl.h<br>
    lldb/trunk/include/lldb/Core/ValueObjectDynamicValue.h<br>
    lldb/trunk/include/lldb/Core/ValueObjectList.h<br>
    lldb/trunk/include/lldb/Core/ValueObjectMemory.h<br>
    lldb/trunk/include/lldb/Core/ValueObjectRegister.h<br>
    lldb/trunk/include/lldb/Core/ValueObjectSyntheticFilter.h<br>
    lldb/trunk/include/lldb/Core/ValueObjectVariable.h<br>
    lldb/trunk/include/lldb/Core/dwarf.h<br>
    lldb/trunk/include/lldb/Expression/ClangFunction.h<br>
    lldb/trunk/include/lldb/Expression/DWARFExpression.h<br>
    lldb/trunk/include/lldb/Host/File.h<br>
    lldb/trunk/include/lldb/Interpreter/Args.h<br>
    lldb/trunk/include/lldb/Interpreter/CommandInterpreter.h<br>
    lldb/trunk/include/lldb/Interpreter/CommandObject.h<br>
    lldb/trunk/include/lldb/Interpreter/CommandReturnObject.h<br>
    lldb/trunk/include/lldb/Interpreter/OptionValueArray.h<br>
    lldb/trunk/include/lldb/Interpreter/OptionValueDictionary.h<br>
    lldb/trunk/include/lldb/Interpreter/ScriptInterpreter.h<br>
    lldb/trunk/include/lldb/Interpreter/ScriptInterpreterPython.h<br>
    lldb/trunk/include/lldb/Symbol/Block.h<br>
    lldb/trunk/include/lldb/Symbol/ClangASTContext.h<br>
    lldb/trunk/include/lldb/Symbol/ObjectFile.h<br>
    lldb/trunk/include/lldb/Symbol/Symbol.h<br>
    lldb/trunk/include/lldb/Symbol/SymbolContext.h<br>
    lldb/trunk/include/lldb/Symbol/SymbolVendor.h<br>
    lldb/trunk/include/lldb/Symbol/Symtab.h<br>
    lldb/trunk/include/lldb/Symbol/Variable.h<br>
    lldb/trunk/include/lldb/Symbol/VariableList.h<br>
    lldb/trunk/include/lldb/Target/Platform.h<br>
    lldb/trunk/include/lldb/Target/Process.h<br>
    lldb/trunk/include/lldb/Target/RegisterContext.h<br>
    lldb/trunk/include/lldb/lldb-defines.h<br>
    lldb/trunk/include/lldb/lldb-types.h<br>
    lldb/trunk/scripts/Python/interface/SBData.i<br>
    lldb/trunk/source/API/SBData.cpp<br>
    lldb/trunk/source/Breakpoint/Breakpoint.cpp<br>
    lldb/trunk/source/Breakpoint/BreakpointIDList.cpp<br>
    lldb/trunk/source/Breakpoint/BreakpointList.cpp<br>
    lldb/trunk/source/Breakpoint/BreakpointLocationCollection.cpp<br>
    lldb/trunk/source/Breakpoint/BreakpointLocationList.cpp<br>
    lldb/trunk/source/Breakpoint/BreakpointResolverFileLine.cpp<br>
    lldb/trunk/source/Breakpoint/BreakpointResolverName.cpp<br>
    lldb/trunk/source/Breakpoint/BreakpointSite.cpp<br>
    lldb/trunk/source/Breakpoint/Watchpoint.cpp<br>
    lldb/trunk/source/Commands/CommandCompletions.cpp<br>
    lldb/trunk/source/Commands/CommandObjectApropos.cpp<br>
    lldb/trunk/source/Commands/CommandObjectArgs.cpp<br>
    lldb/trunk/source/Commands/CommandObjectBreakpoint.cpp<br>
    lldb/trunk/source/Commands/CommandObjectCommands.cpp<br>
    lldb/trunk/source/Commands/CommandObjectExpression.cpp<br>
    lldb/trunk/source/Commands/CommandObjectFrame.cpp<br>
    lldb/trunk/source/Commands/CommandObjectHelp.cpp<br>
    lldb/trunk/source/Commands/CommandObjectMemory.cpp<br>
    lldb/trunk/source/Commands/CommandObjectMultiword.cpp<br>
    lldb/trunk/source/Commands/CommandObjectPlatform.cpp<br>
    lldb/trunk/source/Commands/CommandObjectProcess.cpp<br>
    lldb/trunk/source/Commands/CommandObjectRegister.cpp<br>
    lldb/trunk/source/Commands/CommandObjectSource.cpp<br>
    lldb/trunk/source/Commands/CommandObjectSyntax.cpp<br>
    lldb/trunk/source/Commands/CommandObjectTarget.cpp<br>
    lldb/trunk/source/Commands/CommandObjectThread.cpp<br>
    lldb/trunk/source/Commands/CommandObjectWatchpoint.cpp<br>
    lldb/trunk/source/Core/Address.cpp<br>
    lldb/trunk/source/Core/ArchSpec.cpp<br>
    lldb/trunk/source/Core/CXXFormatterFunctions.cpp<br>
    lldb/trunk/source/Core/ConstString.cpp<br>
    lldb/trunk/source/Core/DataBufferMemoryMap.cpp<br>
    lldb/trunk/source/Core/DataExtractor.cpp<br>
    lldb/trunk/source/Core/Debugger.cpp<br>
    lldb/trunk/source/Core/Disassembler.cpp<br>
    lldb/trunk/source/Core/EmulateInstruction.cpp<br>
    lldb/trunk/source/Core/Error.cpp<br>
    lldb/trunk/source/Core/FileSpecList.cpp<br>
    lldb/trunk/source/Core/FormatClasses.cpp<br>
    lldb/trunk/source/Core/FormatManager.cpp<br>
    lldb/trunk/source/Core/Module.cpp<br>
    lldb/trunk/source/Core/ModuleList.cpp<br>
    lldb/trunk/source/Core/PluginManager.cpp<br>
    lldb/trunk/source/Core/RegisterValue.cpp<br>
    lldb/trunk/source/Core/Scalar.cpp<br>
    lldb/trunk/source/Core/SearchFilter.cpp<br>
    lldb/trunk/source/Core/Section.cpp<br>
    lldb/trunk/source/Core/SourceManager.cpp<br>
    lldb/trunk/source/Core/Stream.cpp<br>
    lldb/trunk/source/Core/StreamAsynchronousIO.cpp<br>
    lldb/trunk/source/Core/StreamCallback.cpp<br>
    lldb/trunk/source/Core/StreamFile.cpp<br>
    lldb/trunk/source/Core/StreamString.cpp<br>
    lldb/trunk/source/Core/StringList.cpp<br>
    lldb/trunk/source/Core/UUID.cpp<br>
    lldb/trunk/source/Core/VMRange.cpp<br>
    lldb/trunk/source/Core/Value.cpp<br>
    lldb/trunk/source/Core/ValueObject.cpp<br>
    lldb/trunk/source/Core/ValueObjectCast.cpp<br>
    lldb/trunk/source/Core/ValueObjectChild.cpp<br>
    lldb/trunk/source/Core/ValueObjectConstResult.cpp<br>
    lldb/trunk/source/Core/ValueObjectConstResultChild.cpp<br>
    lldb/trunk/source/Core/ValueObjectConstResultImpl.cpp<br>
    lldb/trunk/source/Core/ValueObjectDynamicValue.cpp<br>
    lldb/trunk/source/Core/ValueObjectList.cpp<br>
    lldb/trunk/source/Core/ValueObjectMemory.cpp<br>
    lldb/trunk/source/Core/ValueObjectRegister.cpp<br>
    lldb/trunk/source/Core/ValueObjectSyntheticFilter.cpp<br>
    lldb/trunk/source/Core/ValueObjectVariable.cpp<br>
    lldb/trunk/source/Expression/ClangASTSource.cpp<br>
    lldb/trunk/source/Expression/ClangExpressionParser.cpp<br>
    lldb/trunk/source/Expression/ClangFunction.cpp<br>
    lldb/trunk/source/Expression/DWARFExpression.cpp<br>
    lldb/trunk/source/Expression/IRInterpreter.cpp<br>
    lldb/trunk/source/Host/common/File.cpp<br>
    lldb/trunk/source/Host/common/FileSpec.cpp<br>
    lldb/trunk/source/Host/macosx/Host.mm<br>
    lldb/trunk/source/Host/macosx/Symbols.cpp<br>
    lldb/trunk/source/Interpreter/Args.cpp<br>
    lldb/trunk/source/Interpreter/CommandInterpreter.cpp<br>
    lldb/trunk/source/Interpreter/CommandObject.cpp<br>
    lldb/trunk/source/Interpreter/CommandReturnObject.cpp<br>
    lldb/trunk/source/Interpreter/PythonDataObjects.cpp<br>
    lldb/trunk/source/Interpreter/ScriptInterpreterPython.cpp<br>
    lldb/trunk/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp<br>
    lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp<br>
    lldb/trunk/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp<br>
    lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp<br>
    lldb/trunk/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h<br>
    lldb/trunk/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp<br>
    lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp<br>
    lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp<br>
    lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp<br>
    lldb/trunk/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h<br>
    lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp<br>
    lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp<br>
    lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp<br>
    lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp<br>
    lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp<br>
    lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h<br>
    lldb/trunk/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp<br>
    lldb/trunk/source/Plugins/ObjectFile/ELF/ELFHeader.cpp<br>
    lldb/trunk/source/Plugins/ObjectFile/ELF/ELFHeader.h<br>
    lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp<br>
    lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.h<br>
    lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp<br>
    lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h<br>
    lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp<br>
    lldb/trunk/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h<br>
    lldb/trunk/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp<br>
    lldb/trunk/source/Plugins/Process/MacOSX-Kernel/CommunicationKDP.cpp<br>
    lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ThreadKDP.cpp<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm.cpp<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_arm.h<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_i386.cpp<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_i386.h<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.cpp<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextDarwin_x86_64.h<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.cpp<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextLLDB.h<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.h<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextMemory.cpp<br>
    lldb/trunk/source/Plugins/Process/Utility/RegisterContextMemory.h<br>
    lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp<br>
    lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h<br>
    lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFLocationDescription.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFLocationList.cpp<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFLocationList.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/HashedNameToDIE.h<br>
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp<br>
    lldb/trunk/source/Symbol/ClangASTContext.cpp<br>
    lldb/trunk/source/Symbol/ClangASTType.cpp<br>
    lldb/trunk/source/Symbol/DWARFCallFrameInfo.cpp<br>
    lldb/trunk/source/Symbol/Symbol.cpp<br>
    lldb/trunk/source/Symbol/SymbolContext.cpp<br>
    lldb/trunk/source/Symbol/SymbolVendor.cpp<br>
    lldb/trunk/source/Symbol/Symtab.cpp<br>
    lldb/trunk/source/Symbol/VariableList.cpp<br>
    lldb/trunk/source/Target/Process.cpp<br>
    lldb/trunk/source/Target/Target.cpp<br>
    lldb/trunk/source/Utility/StringExtractor.cpp<br>
    lldb/trunk/source/Utility/StringExtractor.h<br>
    lldb/trunk/tools/debugserver/source/DNBDataRef.cpp<br>
<br>
Modified: lldb/trunk/examples/python/operating_system.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/examples/python/operating_system.py?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/examples/python/operating_system.py?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/examples/python/operating_system.py (original)<br>
+++ lldb/trunk/examples/python/operating_system.py Fri Jan 25 12:06:21 2013<br>
@@ -25,8 +25,9 @@<br>
         return self.process.target<br>
<br>
     def create_thread(self, tid, context):<br>
+        print 'tid type is: ' + str(type(tid))<br>
         if tid == 0x444444444:<br>
-            thread_info = { 'tid' : 0x444444444, 'name' : 'four'  , 'queue' : 'queue4', 'state' : 'stopped', 'stop_reason' : 'none' }<br>
+            thread_info = { 'tid' : tid, 'name' : 'four'  , 'queue' : 'queue4', 'state' : 'stopped', 'stop_reason' : 'none' }<br>
             self.threads.append(thread_info)<br>
             return thread_info<br>
         return None<br>
<br>
Modified: lldb/trunk/include/lldb/API/SBData.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBData.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/API/SBData.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/API/SBData.h (original)<br>
+++ lldb/trunk/include/lldb/API/SBData.h Fri Jan 25 12:06:21 2013<br>
@@ -49,47 +49,47 @@<br>
     SetByteOrder (lldb::ByteOrder endian);<br>
<br>
     float<br>
-    GetFloat (lldb::SBError& error, uint32_t offset);<br>
+    GetFloat (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     double<br>
-    GetDouble (lldb::SBError& error, uint32_t offset);<br>
+    GetDouble (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     long double<br>
-    GetLongDouble (lldb::SBError& error, uint32_t offset);<br>
+    GetLongDouble (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     lldb::addr_t<br>
-    GetAddress (lldb::SBError& error, uint32_t offset);<br>
+    GetAddress (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     uint8_t<br>
-    GetUnsignedInt8 (lldb::SBError& error, uint32_t offset);<br>
+    GetUnsignedInt8 (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     uint16_t<br>
-    GetUnsignedInt16 (lldb::SBError& error, uint32_t offset);<br>
+    GetUnsignedInt16 (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     uint32_t<br>
-    GetUnsignedInt32 (lldb::SBError& error, uint32_t offset);<br>
+    GetUnsignedInt32 (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     uint64_t<br>
-    GetUnsignedInt64 (lldb::SBError& error, uint32_t offset);<br>
+    GetUnsignedInt64 (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     int8_t<br>
-    GetSignedInt8 (lldb::SBError& error, uint32_t offset);<br>
+    GetSignedInt8 (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     int16_t<br>
-    GetSignedInt16 (lldb::SBError& error, uint32_t offset);<br>
+    GetSignedInt16 (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     int32_t<br>
-    GetSignedInt32 (lldb::SBError& error, uint32_t offset);<br>
+    GetSignedInt32 (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     int64_t<br>
-    GetSignedInt64 (lldb::SBError& error, uint32_t offset);<br>
+    GetSignedInt64 (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     const char*<br>
-    GetString (lldb::SBError& error, uint32_t offset);<br>
+    GetString (lldb::SBError& error, lldb::offset_t offset);<br>
<br>
     size_t<br>
     ReadRawData (lldb::SBError& error,<br>
-                 uint32_t offset,<br>
+                 lldb::offset_t offset,<br>
                  void *buf,<br>
                  size_t size);<br>
<br>
<br>
Modified: lldb/trunk/include/lldb/Breakpoint/Breakpoint.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Breakpoint.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Breakpoint.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Breakpoint/Breakpoint.h (original)<br>
+++ lldb/trunk/include/lldb/Breakpoint/Breakpoint.h Fri Jan 25 12:06:21 2013<br>
@@ -136,7 +136,7 @@<br>
         static lldb::BreakpointLocationSP<br>
         GetBreakpointLocationAtIndexFromEvent (const lldb::EventSP &event_sp, uint32_t loc_idx);<br>
<br>
-        static uint32_t<br>
+        static size_t<br>
         GetNumBreakpointLocationsFromEvent (const lldb::EventSP &event_sp);<br>
<br>
         static const BreakpointEventData *<br>
@@ -310,7 +310,7 @@<br>
     ///     greater than then number of actual locations.<br>
     //------------------------------------------------------------------<br>
     lldb::BreakpointLocationSP<br>
-    GetLocationAtIndex (uint32_t index);<br>
+    GetLocationAtIndex (size_t index);<br>
<br>
     //------------------------------------------------------------------<br>
     // The next section deals with various breakpoint options.<br>
<br>
Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointIDList.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointIDList.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointIDList.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Breakpoint/BreakpointIDList.h (original)<br>
+++ lldb/trunk/include/lldb/Breakpoint/BreakpointIDList.h Fri Jan 25 12:06:21 2013<br>
@@ -41,10 +41,10 @@<br>
     GetSize();<br>
<br>
     BreakpointID &<br>
-    GetBreakpointIDAtIndex (uint32_t index);<br>
+    GetBreakpointIDAtIndex (size_t index);<br>
<br>
     bool<br>
-    RemoveBreakpointIDAtIndex (uint32_t index);<br>
+    RemoveBreakpointIDAtIndex (size_t index);<br>
<br>
     void<br>
     Clear();<br>
@@ -56,16 +56,16 @@<br>
     AddBreakpointID (const char *bp_id);<br>
<br>
     bool<br>
-    FindBreakpointID (BreakpointID &bp_id, uint32_t *position);<br>
+    FindBreakpointID (BreakpointID &bp_id, size_t *position);<br>
<br>
     bool<br>
-    FindBreakpointID (const char *bp_id, uint32_t *position);<br>
+    FindBreakpointID (const char *bp_id, size_t *position);<br>
<br>
     void<br>
-    InsertStringArray (const char **string_array, uint32_t array_size, CommandReturnObject &result);<br>
+    InsertStringArray (const char **string_array, size_t array_size, CommandReturnObject &result);<br>
<br>
     static bool<br>
-    StringContainsIDRangeExpression (const char *in_string, uint32_t *range_start_len, uint32_t *range_end_pos);<br>
+    StringContainsIDRangeExpression (const char *in_string, size_t *range_start_len, size_t *range_end_pos);<br>
<br>
     static void<br>
     FindAndReplaceIDRanges (Args &old_args, Target *target, CommandReturnObject &result, Args &new_args);<br>
<br>
Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointList.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointList.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointList.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Breakpoint/BreakpointList.h (original)<br>
+++ lldb/trunk/include/lldb/Breakpoint/BreakpointList.h Fri Jan 25 12:06:21 2013<br>
@@ -92,7 +92,7 @@<br>
     ///   breakpoint doesn't exist.<br>
     //------------------------------------------------------------------<br>
     lldb::BreakpointSP<br>
-    GetBreakpointAtIndex (uint32_t i);<br>
+    GetBreakpointAtIndex (size_t i);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Returns a shared pointer to the breakpoint with index \a i, const version<br>
@@ -105,7 +105,7 @@<br>
     ///   breakpoint doesn't exist.<br>
     //------------------------------------------------------------------<br>
     const lldb::BreakpointSP<br>
-    GetBreakpointAtIndex (uint32_t i) const;<br>
+    GetBreakpointAtIndex (size_t i) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Returns the number of elements in this breakpoint list.<br>
<br>
Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointLocationCollection.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointLocationCollection.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointLocationCollection.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Breakpoint/BreakpointLocationCollection.h (original)<br>
+++ lldb/trunk/include/lldb/Breakpoint/BreakpointLocationCollection.h Fri Jan 25 12:06:21 2013<br>
@@ -101,7 +101,7 @@<br>
     ///     pointer if the breakpoint doesn't exist.<br>
     //------------------------------------------------------------------<br>
     lldb::BreakpointLocationSP<br>
-    GetByIndex (uint32_t i);<br>
+    GetByIndex (size_t i);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Returns a shared pointer to the breakpoint location with index<br>
@@ -115,7 +115,7 @@<br>
     ///     pointer if the breakpoint doesn't exist.<br>
     //------------------------------------------------------------------<br>
     const lldb::BreakpointLocationSP<br>
-    GetByIndex (uint32_t i) const;<br>
+    GetByIndex (size_t i) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Returns the number of elements in this breakpoint location list.<br>
<br>
Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointLocationList.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointLocationList.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointLocationList.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Breakpoint/BreakpointLocationList.h (original)<br>
+++ lldb/trunk/include/lldb/Breakpoint/BreakpointLocationList.h Fri Jan 25 12:06:21 2013<br>
@@ -119,7 +119,7 @@<br>
     ///     pointer if the breakpoint doesn't exist.<br>
     //------------------------------------------------------------------<br>
     lldb::BreakpointLocationSP<br>
-    GetByIndex (uint32_t i);<br>
+    GetByIndex (size_t i);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Returns a shared pointer to the breakpoint location with index<br>
@@ -133,7 +133,7 @@<br>
     ///     pointer if the breakpoint doesn't exist.<br>
     //------------------------------------------------------------------<br>
     const lldb::BreakpointLocationSP<br>
-    GetByIndex (uint32_t i) const;<br>
+    GetByIndex (size_t i) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Removes all the locations in this list from their breakpoint site<br>
<br>
Modified: lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h (original)<br>
+++ lldb/trunk/include/lldb/Breakpoint/BreakpointSite.h Fri Jan 25 12:06:21 2013<br>
@@ -83,7 +83,7 @@<br>
     //------------------------------------------------------------------<br>
     bool<br>
     SetTrapOpcode (const uint8_t *trap_opcode,<br>
-                   size_t trap_opcode_size);<br>
+                   uint32_t trap_opcode_size);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Gets the original instruction bytes that were overwritten by the trap<br>
@@ -168,7 +168,7 @@<br>
     /// @return<br>
     ///    The number of owners.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     GetNumberOfOwners ();<br>
<br>
     //------------------------------------------------------------------<br>
@@ -183,7 +183,7 @@<br>
     ///    A shared pointer to the breakpoint location at that index.<br>
     //------------------------------------------------------------------<br>
     lldb::BreakpointLocationSP<br>
-    GetOwnerAtIndex (uint32_t index);<br>
+    GetOwnerAtIndex (size_t idx);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Check whether the owners of this breakpoint site have any<br>
@@ -244,7 +244,7 @@<br>
     /// @param[in] context<br>
     ///    \a break_loc_id is the Breakpoint Location to remove.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     RemoveOwner (lldb::break_id_t break_id,<br>
                  lldb::break_id_t break_loc_id);<br>
<br>
@@ -265,7 +265,6 @@<br>
     BreakpointSite (BreakpointSiteList *list,<br>
                     const lldb::BreakpointLocationSP& owner,<br>
                     lldb::addr_t m_addr,<br>
-                    lldb::tid_t tid,<br>
                     bool use_hardware);<br>
<br>
     DISALLOW_COPY_AND_ASSIGN(BreakpointSite);<br>
<br>
Modified: lldb/trunk/include/lldb/Breakpoint/Watchpoint.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Watchpoint.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Breakpoint/Watchpoint.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Breakpoint/Watchpoint.h (original)<br>
+++ lldb/trunk/include/lldb/Breakpoint/Watchpoint.h Fri Jan 25 12:06:21 2013<br>
@@ -76,7 +76,7 @@<br>
         DISALLOW_COPY_AND_ASSIGN (WatchpointEventData);<br>
     };<br>
<br>
-    Watchpoint (Target& target, lldb::addr_t addr, size_t size, const ClangASTType *type, bool hardware = true);<br>
+    Watchpoint (Target& target, lldb::addr_t addr, uint32_t size, const ClangASTType *type, bool hardware = true);<br>
     ~Watchpoint ();<br>
<br>
     void<br>
<br>
Modified: lldb/trunk/include/lldb/Core/ArchSpec.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ArchSpec.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ArchSpec.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/ArchSpec.h (original)<br>
+++ lldb/trunk/include/lldb/Core/ArchSpec.h Fri Jan 25 12:06:21 2013<br>
@@ -159,7 +159,7 @@<br>
     const ArchSpec&<br>
     operator= (const ArchSpec& rhs);<br>
<br>
-    static uint32_t<br>
+    static size_t<br>
     AutoComplete (const char *name,<br>
                   StringList &matches);<br>
<br>
<br>
Modified: lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h (original)<br>
+++ lldb/trunk/include/lldb/Core/CXXFormatterFunctions.h Fri Jan 25 12:06:21 2013<br>
@@ -135,11 +135,11 @@<br>
         public:<br>
             NSArrayMSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);<br>
<br>
-            virtual uint32_t<br>
+            virtual size_t<br>
             CalculateNumChildren ();<br>
<br>
             virtual lldb::ValueObjectSP<br>
-            GetChildAtIndex (uint32_t idx);<br>
+            GetChildAtIndex (size_t idx);<br>
<br>
             virtual bool<br>
             Update();<br>
@@ -166,11 +166,11 @@<br>
         public:<br>
             NSArrayISyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);<br>
<br>
-            virtual uint32_t<br>
+            virtual size_t<br>
             CalculateNumChildren ();<br>
<br>
             virtual lldb::ValueObjectSP<br>
-            GetChildAtIndex (uint32_t idx);<br>
+            GetChildAtIndex (size_t idx);<br>
<br>
             virtual bool<br>
             Update();<br>
@@ -186,7 +186,7 @@<br>
         private:<br>
             ExecutionContextRef m_exe_ctx_ref;<br>
             uint8_t m_ptr_size;<br>
-            uint64_t m_items;<br>
+            size_t m_items;<br>
             lldb::addr_t m_data_ptr;<br>
             ClangASTType m_id_type;<br>
             std::vector<lldb::ValueObjectSP> m_children;<br>
@@ -197,11 +197,11 @@<br>
         public:<br>
             NSArrayCodeRunningSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);<br>
<br>
-            virtual uint32_t<br>
+            virtual size_t<br>
             CalculateNumChildren ();<br>
<br>
             virtual lldb::ValueObjectSP<br>
-            GetChildAtIndex (uint32_t idx);<br>
+            GetChildAtIndex (size_t idx);<br>
<br>
             virtual bool<br>
             Update();<br>
@@ -242,11 +242,11 @@<br>
         public:<br>
             NSDictionaryISyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);<br>
<br>
-            virtual uint32_t<br>
+            virtual size_t<br>
             CalculateNumChildren ();<br>
<br>
             virtual lldb::ValueObjectSP<br>
-            GetChildAtIndex (uint32_t idx);<br>
+            GetChildAtIndex (size_t idx);<br>
<br>
             virtual bool<br>
             Update();<br>
@@ -298,11 +298,11 @@<br>
         public:<br>
             NSDictionaryMSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);<br>
<br>
-            virtual uint32_t<br>
+            virtual size_t<br>
             CalculateNumChildren ();<br>
<br>
             virtual lldb::ValueObjectSP<br>
-            GetChildAtIndex (uint32_t idx);<br>
+            GetChildAtIndex (size_t idx);<br>
<br>
             virtual bool<br>
             Update();<br>
@@ -328,11 +328,11 @@<br>
         public:<br>
             NSDictionaryCodeRunningSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);<br>
<br>
-            virtual uint32_t<br>
+            virtual size_t<br>
             CalculateNumChildren ();<br>
<br>
             virtual lldb::ValueObjectSP<br>
-            GetChildAtIndex (uint32_t idx);<br>
+            GetChildAtIndex (size_t idx);<br>
<br>
             virtual bool<br>
             Update();<br>
<br>
Modified: lldb/trunk/include/lldb/Core/DataExtractor.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/DataExtractor.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/DataExtractor.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/DataExtractor.h (original)<br>
+++ lldb/trunk/include/lldb/Core/DataExtractor.h Fri Jan 25 12:06:21 2013<br>
@@ -86,7 +86,7 @@<br>
     /// @param[in] addr_size<br>
     ///     A new address byte size value.<br>
     //------------------------------------------------------------------<br>
-    DataExtractor (const void* data, uint32_t data_length, lldb::ByteOrder byte_order, uint8_t addr_size);<br>
+    DataExtractor (const void* data, lldb::offset_t data_length, lldb::ByteOrder byte_order, uint32_t addr_size);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Construct with shared data.<br>
@@ -105,7 +105,7 @@<br>
     /// @param[in] addr_size<br>
     ///     A new address byte size value.<br>
     //------------------------------------------------------------------<br>
-    DataExtractor (const lldb::DataBufferSP& data_sp, lldb::ByteOrder byte_order, uint8_t addr_size);<br>
+    DataExtractor (const lldb::DataBufferSP& data_sp, lldb::ByteOrder byte_order, uint32_t addr_size);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Construct with a subset of \a data.<br>
@@ -130,7 +130,7 @@<br>
     /// @param[in] length<br>
     ///     The length in bytes of the subset of data.<br>
     //------------------------------------------------------------------<br>
-    DataExtractor (const DataExtractor& data, uint32_t offset, uint32_t length);<br>
+    DataExtractor (const DataExtractor& data, lldb::offset_t offset, lldb::offset_t length);<br>
<br>
     DataExtractor (const DataExtractor& rhs);<br>
     //------------------------------------------------------------------<br>
@@ -204,10 +204,10 @@<br>
     /// @return<br>
     ///     The offset at which dumping ended.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    lldb::offset_t<br>
     PutToLog (Log *log,<br>
-              uint32_t offset,<br>
-              uint32_t length,<br>
+              lldb::offset_t offset,<br>
+              lldb::offset_t length,<br>
               uint64_t base_addr,<br>
               uint32_t num_per_line,<br>
               Type type,<br>
@@ -273,13 +273,13 @@<br>
     /// @return<br>
     ///     The offset at which dumping ended.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    lldb::offset_t<br>
     Dump (Stream *s,<br>
-          uint32_t offset,<br>
+          lldb::offset_t offset,<br>
           lldb::Format item_format,<br>
-          uint32_t item_byte_size,<br>
-          uint32_t item_count,<br>
-          uint32_t num_per_line,<br>
+          size_t item_byte_size,<br>
+          size_t item_count,<br>
+          size_t num_per_line,<br>
           uint64_t base_addr,<br>
           uint32_t item_bit_size,<br>
           uint32_t item_bit_offset,<br>
@@ -300,7 +300,7 @@<br>
     ///     UUID value.<br>
     //------------------------------------------------------------------<br>
     void<br>
-    DumpUUID (Stream *s, uint32_t offset) const;<br>
+    DumpUUID (Stream *s, lldb::offset_t offset) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract an arbitrary number of bytes in the specified byte<br>
@@ -332,7 +332,7 @@<br>
     ///     if there aren't enough bytes at the specified offset.<br>
     //------------------------------------------------------------------<br>
     size_t<br>
-    ExtractBytes (uint32_t offset, uint32_t length, lldb::ByteOrder dst_byte_order, void *dst) const;<br>
+    ExtractBytes (lldb::offset_t offset, lldb::offset_t length, lldb::ByteOrder dst_byte_order, void *dst) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract an address from \a *offset_ptr.<br>
@@ -353,10 +353,10 @@<br>
     ///     The extracted address value.<br>
     //------------------------------------------------------------------<br>
     uint64_t<br>
-    GetAddress (uint32_t *offset_ptr) const;<br>
+    GetAddress (lldb::offset_t *offset_ptr) const;<br>
<br>
     uint64_t<br>
-    GetAddress_unchecked (uint32_t *offset_ptr) const;<br>
+    GetAddress_unchecked (lldb::offset_t *offset_ptr) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Get the current address size.<br>
@@ -367,7 +367,7 @@<br>
     /// @return<br>
     ///     The size in bytes of address values that will be extracted.<br>
     //------------------------------------------------------------------<br>
-    uint8_t<br>
+    uint32_t<br>
     GetAddressByteSize () const<br>
     {<br>
         return m_addr_size;<br>
@@ -379,7 +379,7 @@<br>
     /// @return<br>
     ///     The total number of bytes of data this object refers to.<br>
     //------------------------------------------------------------------<br>
-    size_t<br>
+    uint64_t<br>
     GetByteSize () const<br>
     {<br>
         return m_end - m_start;<br>
@@ -408,7 +408,7 @@<br>
     ///     NULL will be returned.<br>
     //------------------------------------------------------------------<br>
     const char *<br>
-    GetCStr (uint32_t *offset_ptr) const;<br>
+    GetCStr (lldb::offset_t *offset_ptr) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract \a length bytes from \a *offset_ptr.<br>
@@ -434,7 +434,7 @@<br>
     ///     and length are valid, or NULL otherwise.<br>
     //------------------------------------------------------------------<br>
     const void*<br>
-    GetData (uint32_t *offset_ptr, uint32_t length) const;<br>
+    GetData (lldb::offset_t *offset_ptr, lldb::offset_t length) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Copy \a dst_len bytes from \a *offset_ptr and ensure the copied<br>
@@ -475,11 +475,11 @@<br>
     ///     Returns the number of bytes that were copied, or zero if<br>
     ///     anything goes wrong.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
-    CopyByteOrderedData (uint32_t src_offset,<br>
-                         uint32_t src_len,<br>
+    lldb::offset_t<br>
+    CopyByteOrderedData (lldb::offset_t src_offset,<br>
+                         lldb::offset_t src_len,<br>
                          void *dst,<br>
-                         uint32_t dst_len,<br>
+                         lldb::offset_t dst_len,<br>
                          lldb::ByteOrder dst_byte_order) const;<br>
<br>
     //------------------------------------------------------------------<br>
@@ -538,13 +538,13 @@<br>
     ///     The floating value that was extracted, or zero on failure.<br>
     //------------------------------------------------------------------<br>
     float<br>
-    GetFloat (uint32_t *offset_ptr) const;<br>
+    GetFloat (lldb::offset_t *offset_ptr) const;<br>
<br>
     double<br>
-    GetDouble (uint32_t *offset_ptr) const;<br>
+    GetDouble (lldb::offset_t *offset_ptr) const;<br>
<br>
     long double<br>
-    GetLongDouble (uint32_t *offset_ptr) const;<br>
+    GetLongDouble (lldb::offset_t *offset_ptr) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract a GNU encoded pointer value from \a *offset_ptr.<br>
@@ -575,7 +575,11 @@<br>
     ///     The extracted GNU encoded pointer value.<br>
     //------------------------------------------------------------------<br>
     uint64_t<br>
-    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);<br>
+    GetGNUEHPointer (lldb::offset_t *offset_ptr,<br>
+                     uint32_t eh_ptr_enc,<br>
+                     lldb::addr_t pc_rel_addr,<br>
+                     lldb::addr_t text_addr,<br>
+                     lldb::addr_t data_addr);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract an integer of size \a byte_size from \a *offset_ptr.<br>
@@ -601,7 +605,7 @@<br>
     ///     The integer value that was extracted, or zero on failure.<br>
     //------------------------------------------------------------------<br>
     uint32_t<br>
-    GetMaxU32 (uint32_t *offset_ptr, uint32_t byte_size) const;<br>
+    GetMaxU32 (lldb::offset_t *offset_ptr, size_t byte_size) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract an unsigned integer of size \a byte_size from \a<br>
@@ -630,10 +634,10 @@<br>
     ///     failure.<br>
     //------------------------------------------------------------------<br>
     uint64_t<br>
-    GetMaxU64 (uint32_t *offset_ptr, uint32_t byte_size) const;<br>
+    GetMaxU64 (lldb::offset_t *offset_ptr, size_t byte_size) const;<br>
<br>
     uint64_t<br>
-    GetMaxU64_unchecked (uint32_t *offset_ptr, uint32_t byte_size) const;<br>
+    GetMaxU64_unchecked (lldb::offset_t *offset_ptr, size_t byte_size) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract an signed integer of size \a byte_size from \a *offset_ptr.<br>
@@ -661,7 +665,7 @@<br>
     ///     or zero on failure.<br>
     //------------------------------------------------------------------<br>
     int64_t<br>
-    GetMaxS64 (uint32_t *offset_ptr, uint32_t size) const;<br>
+    GetMaxS64 (lldb::offset_t *offset_ptr, size_t size) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract an unsigned integer of size \a byte_size from \a<br>
@@ -700,7 +704,10 @@<br>
     ///     zero on failure.<br>
     //------------------------------------------------------------------<br>
     uint64_t<br>
-    GetMaxU64Bitfield (uint32_t *offset_ptr, uint32_t size, uint32_t bitfield_bit_size, uint32_t bitfield_bit_offset) const;<br>
+    GetMaxU64Bitfield (lldb::offset_t *offset_ptr,<br>
+                       size_t size,<br>
+                       uint32_t bitfield_bit_size,<br>
+                       uint32_t bitfield_bit_offset) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract an signed integer of size \a byte_size from \a<br>
@@ -739,7 +746,10 @@<br>
     ///     zero on failure.<br>
     //------------------------------------------------------------------<br>
     int64_t<br>
-    GetMaxS64Bitfield (uint32_t *offset_ptr, uint32_t size, uint32_t bitfield_bit_size, uint32_t bitfield_bit_offset) const;<br>
+    GetMaxS64Bitfield (lldb::offset_t *offset_ptr,<br>
+                       size_t size,<br>
+                       uint32_t bitfield_bit_size,<br>
+                       uint32_t bitfield_bit_offset) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract an pointer from \a *offset_ptr.<br>
@@ -760,7 +770,7 @@<br>
     ///     The extracted pointer value as a 64 integer.<br>
     //------------------------------------------------------------------<br>
     uint64_t<br>
-    GetPointer (uint32_t *offset_ptr) const;<br>
+    GetPointer (lldb::offset_t *offset_ptr) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Get the current byte order value.<br>
@@ -792,10 +802,10 @@<br>
     ///     The extracted uint8_t value.<br>
     //------------------------------------------------------------------<br>
     uint8_t<br>
-    GetU8 ( uint32_t *offset_ptr) const;<br>
+    GetU8 ( lldb::offset_t *offset_ptr) const;<br>
<br>
     uint8_t<br>
-    GetU8_unchecked (uint32_t *offset_ptr) const<br>
+    GetU8_unchecked (lldb::offset_t *offset_ptr) const<br>
     {<br>
         uint8_t val = m_start[*offset_ptr];<br>
         *offset_ptr += 1;<br>
@@ -803,13 +813,13 @@<br>
     }<br>
<br>
     uint16_t<br>
-    GetU16_unchecked (uint32_t *offset_ptr) const;<br>
+    GetU16_unchecked (lldb::offset_t *offset_ptr) const;<br>
<br>
     uint32_t<br>
-    GetU32_unchecked (uint32_t *offset_ptr) const;<br>
+    GetU32_unchecked (lldb::offset_t *offset_ptr) const;<br>
<br>
     uint64_t<br>
-    GetU64_unchecked (uint32_t *offset_ptr) const;<br>
+    GetU64_unchecked (lldb::offset_t *offset_ptr) const;<br>
     //------------------------------------------------------------------<br>
     /// Extract \a count uint8_t values from \a *offset_ptr.<br>
     ///<br>
@@ -836,7 +846,7 @@<br>
     ///     NULL otherise.<br>
     //------------------------------------------------------------------<br>
     void *<br>
-    GetU8 ( uint32_t *offset_ptr, void *dst, uint32_t count) const;<br>
+    GetU8 (lldb::offset_t *offset_ptr, void *dst, uint32_t count) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract a uint16_t value from \a *offset_ptr.<br>
@@ -855,7 +865,7 @@<br>
     ///     The extracted uint16_t value.<br>
     //------------------------------------------------------------------<br>
     uint16_t<br>
-    GetU16 (uint32_t *offset_ptr) const;<br>
+    GetU16 (lldb::offset_t *offset_ptr) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract \a count uint16_t values from \a *offset_ptr.<br>
@@ -883,7 +893,7 @@<br>
     ///     NULL otherise.<br>
     //------------------------------------------------------------------<br>
     void *<br>
-    GetU16 (uint32_t *offset_ptr, void *dst, uint32_t count) const;<br>
+    GetU16 (lldb::offset_t *offset_ptr, void *dst, uint32_t count) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract a uint32_t value from \a *offset_ptr.<br>
@@ -902,7 +912,7 @@<br>
     ///     The extracted uint32_t value.<br>
     //------------------------------------------------------------------<br>
     uint32_t<br>
-    GetU32 (uint32_t *offset_ptr) const;<br>
+    GetU32 (lldb::offset_t *offset_ptr) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract \a count uint32_t values from \a *offset_ptr.<br>
@@ -930,7 +940,7 @@<br>
     ///     NULL otherise.<br>
     //------------------------------------------------------------------<br>
     void *<br>
-    GetU32 (uint32_t *offset_ptr, void *dst, uint32_t count) const;<br>
+    GetU32 (lldb::offset_t *offset_ptr, void *dst, uint32_t count) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract a uint64_t value from \a *offset_ptr.<br>
@@ -949,7 +959,7 @@<br>
     ///     The extracted uint64_t value.<br>
     //------------------------------------------------------------------<br>
     uint64_t<br>
-    GetU64 (uint32_t *offset_ptr) const;<br>
+    GetU64 (lldb::offset_t *offset_ptr) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract \a count uint64_t values from \a *offset_ptr.<br>
@@ -977,7 +987,7 @@<br>
     ///     NULL otherise.<br>
     //------------------------------------------------------------------<br>
     void *<br>
-    GetU64 ( uint32_t *offset_ptr, void *dst, uint32_t count) const;<br>
+    GetU64 ( lldb::offset_t *offset_ptr, void *dst, uint32_t count) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract a signed LEB128 value from \a *offset_ptr.<br>
@@ -998,7 +1008,7 @@<br>
     ///     The extracted signed integer value.<br>
     //------------------------------------------------------------------<br>
     int64_t<br>
-    GetSLEB128 (uint32_t *offset_ptr) const;<br>
+    GetSLEB128 (lldb::offset_t *offset_ptr) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Extract a unsigned LEB128 value from \a *offset_ptr.<br>
@@ -1019,7 +1029,7 @@<br>
     ///     The extracted unsigned integer value.<br>
     //------------------------------------------------------------------<br>
     uint64_t<br>
-    GetULEB128 (uint32_t *offset_ptr) const;<br>
+    GetULEB128 (lldb::offset_t *offset_ptr) const;<br>
<br>
     lldb::DataBufferSP &<br>
     GetSharedDataBuffer ()<br>
@@ -1042,7 +1052,7 @@<br>
     ///     NULL otherwise.<br>
     //------------------------------------------------------------------<br>
     const char *<br>
-    PeekCStr (uint32_t offset) const;<br>
+    PeekCStr (lldb::offset_t offset) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Peek at a bytes at \a offset.<br>
@@ -1056,7 +1066,7 @@<br>
     ///     otherwise.<br>
     //------------------------------------------------------------------<br>
     const uint8_t*<br>
-    PeekData (uint32_t offset, uint32_t length) const;<br>
+    PeekData (lldb::offset_t offset, lldb::offset_t length) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Set the address byte size.<br>
@@ -1068,7 +1078,7 @@<br>
     ///     The size in bytes to use when extracting addresses.<br>
     //------------------------------------------------------------------<br>
     void<br>
-    SetAddressByteSize (uint8_t addr_size)<br>
+    SetAddressByteSize (uint32_t addr_size)<br>
     {<br>
         m_addr_size = addr_size;<br>
     }<br>
@@ -1094,8 +1104,8 @@<br>
     /// @return<br>
     ///     The number of bytes that this object now contains.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
-    SetData (const void *bytes, uint32_t length, lldb::ByteOrder byte_order);<br>
+    lldb::offset_t<br>
+    SetData (const void *bytes, lldb::offset_t length, lldb::ByteOrder byte_order);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Adopt a subset of \a data.<br>
@@ -1123,8 +1133,8 @@<br>
     /// @return<br>
     ///     The number of bytes that this object now contains.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
-    SetData (const DataExtractor& data, uint32_t offset, uint32_t length);<br>
+    lldb::offset_t<br>
+    SetData (const DataExtractor& data, lldb::offset_t offset, lldb::offset_t length);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Adopt a subset of shared data in \a data_sp.<br>
@@ -1151,8 +1161,8 @@<br>
     /// @return<br>
     ///     The number of bytes that this object now contains.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
-    SetData (const lldb::DataBufferSP& data_sp, uint32_t offset = 0, uint32_t length = UINT32_MAX);<br>
+    lldb::offset_t<br>
+    SetData (const lldb::DataBufferSP& data_sp, lldb::offset_t offset = 0, lldb::offset_t length = LLDB_INVALID_OFFSET);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Set the byte_order value.<br>
@@ -1188,7 +1198,7 @@<br>
     //      The number of bytes consumed during the extraction.<br>
     //------------------------------------------------------------------<br>
     uint32_t<br>
-    Skip_LEB128 (uint32_t *offset_ptr) const;<br>
+    Skip_LEB128 (lldb::offset_t *offset_ptr) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Test the validity of \a offset.<br>
@@ -1198,7 +1208,7 @@<br>
     ///     object, \b false otherwise.<br>
     //------------------------------------------------------------------<br>
     bool<br>
-    ValidOffset (uint32_t offset) const<br>
+    ValidOffset (lldb::offset_t offset) const<br>
     {<br>
         return offset < GetByteSize();<br>
     }<br>
@@ -1211,7 +1221,7 @@<br>
     ///     length bytes available at that offset, \b false otherwise.<br>
     //------------------------------------------------------------------<br>
     bool<br>
-    ValidOffsetForDataOfSize (uint32_t offset, uint32_t length) const;<br>
+    ValidOffsetForDataOfSize (lldb::offset_t offset, lldb::offset_t length) const;<br>
<br>
     size_t<br>
     Copy (DataExtractor& dest_data) const;<br>
@@ -1220,7 +1230,7 @@<br>
     Append (DataExtractor& rhs);<br>
<br>
     bool<br>
-    Append (void* bytes, uint32_t length);<br>
+    Append (void* bytes, lldb::offset_t length);<br>
<br>
 protected:<br>
     //------------------------------------------------------------------<br>
@@ -1229,7 +1239,7 @@<br>
     const uint8_t * m_start;        ///< A pointer to the first byte of data.<br>
     const uint8_t * m_end;          ///< A pointer to the byte that is past the end of the data.<br>
     lldb::ByteOrder m_byte_order;   ///< The byte order of the data we are extracting from.<br>
-    uint8_t         m_addr_size;    ///< The address size to use when extracting pointers or addresses<br>
+    uint32_t m_addr_size;           ///< The address size to use when extracting pointers or addresses<br>
     mutable lldb::DataBufferSP m_data_sp; ///< The shared pointer to data that can be shared among multilple instances<br>
 };<br>
<br>
<br>
Modified: lldb/trunk/include/lldb/Core/Debugger.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Debugger.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Debugger.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/Debugger.h (original)<br>
+++ lldb/trunk/include/lldb/Core/Debugger.h Fri Jan 25 12:06:21 2013<br>
@@ -227,11 +227,11 @@<br>
     static lldb::DebuggerSP<br>
     FindDebuggerWithInstanceName (const ConstString &instance_name);<br>
<br>
-    static uint32_t<br>
+    static size_t<br>
     GetNumDebuggers();<br>
<br>
     static lldb::DebuggerSP<br>
-    GetDebuggerAtIndex (uint32_t);<br>
+    GetDebuggerAtIndex (size_t index);<br>
<br>
     static bool<br>
     FormatPrompt (const char *format,<br>
<br>
Modified: lldb/trunk/include/lldb/Core/Disassembler.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Disassembler.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Disassembler.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/Disassembler.h (original)<br>
+++ lldb/trunk/include/lldb/Core/Disassembler.h Fri Jan 25 12:06:21 2013<br>
@@ -88,8 +88,8 @@<br>
<br>
     virtual size_t<br>
     Decode (const Disassembler &disassembler,<br>
-            const DataExtractor& data,<br>
-            uint32_t data_offset) = 0;<br>
+            const DataExtractor& data,<br>
+            lldb::offset_t data_offset) = 0;<br>
<br>
     virtual void<br>
     SetDescription (const char *) {}  // May be overridden in sub-classes that have descriptions.<br>
@@ -166,7 +166,7 @@<br>
     GetMaxOpcocdeByteSize () const;<br>
<br>
     lldb::InstructionSP<br>
-    GetInstructionAtIndex (uint32_t idx) const;<br>
+    GetInstructionAtIndex (size_t idx) const;<br>
<br>
     uint32_t<br>
     GetIndexOfNextBranchInstruction(uint32_t start) const;<br>
@@ -218,7 +218,7 @@<br>
     virtual size_t<br>
     Decode (const Disassembler &disassembler,<br>
             const DataExtractor &data,<br>
-            uint32_t data_offset);<br>
+            lldb::offset_t data_offset);<br>
<br>
     void<br>
     SetOpcode (size_t opcode_size, void *opcode_data);<br>
@@ -350,8 +350,8 @@<br>
     virtual size_t<br>
     DecodeInstructions (const Address &base_addr,<br>
                         const DataExtractor& data,<br>
-                        uint32_t data_offset,<br>
-                        uint32_t num_instructions,<br>
+                        lldb::offset_t data_offset,<br>
+                        size_t num_instructions,<br>
                         bool append) = 0;<br>
<br>
     InstructionList &<br>
<br>
Modified: lldb/trunk/include/lldb/Core/FileSpecList.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FileSpecList.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FileSpecList.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/FileSpecList.h (original)<br>
+++ lldb/trunk/include/lldb/Core/FileSpecList.h Fri Jan 25 12:06:21 2013<br>
@@ -123,8 +123,8 @@<br>
     ///     The index of the file that matches \a file if it is found,<br>
     ///     else UINT32_MAX is returned.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
-    FindFileIndex (uint32_t idx, const FileSpec &file, bool full) const;<br>
+    size_t<br>
+    FindFileIndex (size_t idx, const FileSpec &file, bool full) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Get file at index.<br>
@@ -143,7 +143,7 @@<br>
     ///     returned.<br>
     //------------------------------------------------------------------<br>
     const FileSpec &<br>
-    GetFileSpecAtIndex (uint32_t idx) const;<br>
+    GetFileSpecAtIndex (size_t idx) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Get file specification pointer at index.<br>
@@ -159,7 +159,7 @@<br>
     ///     If \a idx is out of range, then an NULL is returned.<br>
     //------------------------------------------------------------------<br>
     const FileSpec *<br>
-    GetFileSpecPointerAtIndex (uint32_t idx) const;<br>
+    GetFileSpecPointerAtIndex (size_t idx) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Get the memory cost of this object.<br>
@@ -182,11 +182,11 @@<br>
     /// @return<br>
     ///     The number of files in the file spec list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     GetSize () const;<br>
<br>
     bool<br>
-    Insert (uint32_t idx, const FileSpec &file)<br>
+    Insert (size_t idx, const FileSpec &file)<br>
     {<br>
         if (idx < m_files.size())<br>
         {<br>
@@ -202,7 +202,7 @@<br>
     }<br>
<br>
     bool<br>
-    Replace (uint32_t idx, const FileSpec &file)<br>
+    Replace (size_t idx, const FileSpec &file)<br>
     {<br>
         if (idx < m_files.size())<br>
         {<br>
@@ -213,7 +213,7 @@<br>
     }<br>
<br>
     bool<br>
-    Remove (uint32_t idx)<br>
+    Remove (size_t idx)<br>
     {<br>
         if (idx < m_files.size())<br>
         {<br>
<br>
Modified: lldb/trunk/include/lldb/Core/FormatClasses.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatClasses.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatClasses.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/FormatClasses.h (original)<br>
+++ lldb/trunk/include/lldb/Core/FormatClasses.h Fri Jan 25 12:06:21 2013<br>
@@ -237,11 +237,11 @@<br>
     {<br>
     }<br>
<br>
-    virtual uint32_t<br>
+    virtual size_t<br>
     CalculateNumChildren () = 0;<br>
<br>
     virtual lldb::ValueObjectSP<br>
-    GetChildAtIndex (uint32_t idx) = 0;<br>
+    GetChildAtIndex (size_t idx) = 0;<br>
<br>
     virtual uint32_t<br>
     GetIndexOfChildWithName (const ConstString &name) = 0;<br>
@@ -479,14 +479,14 @@<br>
         m_expression_paths.clear();<br>
     }<br>
<br>
-    int<br>
+    size_t<br>
     GetCount() const<br>
     {<br>
         return m_expression_paths.size();<br>
     }<br>
<br>
     const char*<br>
-    GetExpressionPathAtIndex(int i) const<br>
+    GetExpressionPathAtIndex(size_t i) const<br>
     {<br>
         return m_expression_paths[i].c_str();<br>
     }<br>
@@ -556,14 +556,14 @@<br>
         {<br>
         }<br>
<br>
-        virtual uint32_t<br>
+        virtual size_t<br>
         CalculateNumChildren()<br>
         {<br>
             return filter->GetCount();<br>
         }<br>
<br>
         virtual lldb::ValueObjectSP<br>
-        GetChildAtIndex (uint32_t idx)<br>
+        GetChildAtIndex (size_t idx)<br>
         {<br>
             if (idx >= filter->GetCount())<br>
                 return lldb::ValueObjectSP();<br>
@@ -720,7 +720,7 @@<br>
         virtual<br>
         ~FrontEnd();<br>
<br>
-        virtual uint32_t<br>
+        virtual size_t<br>
         CalculateNumChildren()<br>
         {<br>
             if (!m_wrapper_sp || m_interpreter == NULL)<br>
@@ -729,7 +729,7 @@<br>
         }<br>
<br>
         virtual lldb::ValueObjectSP<br>
-        GetChildAtIndex (uint32_t idx);<br>
+        GetChildAtIndex (size_t idx);<br>
<br>
         virtual bool<br>
         Update()<br>
@@ -911,7 +911,7 @@<br>
     }<br>
<br>
     int<br>
-    GetRealIndexForIndex(int i);<br>
+    GetRealIndexForIndex(size_t i);<br>
<br>
     bool<br>
     IsScripted()<br>
@@ -939,7 +939,7 @@<br>
         {<br>
         }<br>
<br>
-        virtual uint32_t<br>
+        virtual size_t<br>
         CalculateNumChildren()<br>
         {<br>
             return filter->GetCount();<br>
@@ -952,7 +952,7 @@<br>
         }<br>
<br>
         virtual lldb::ValueObjectSP<br>
-        GetChildAtIndex (uint32_t idx)<br>
+        GetChildAtIndex (size_t idx)<br>
         {<br>
             if (idx >= filter->GetCount())<br>
                 return lldb::ValueObjectSP();<br>
<br>
Modified: lldb/trunk/include/lldb/Core/FormatManager.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatManager.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatManager.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/FormatManager.h (original)<br>
+++ lldb/trunk/include/lldb/Core/FormatManager.h Fri Jan 25 12:06:21 2013<br>
@@ -150,7 +150,7 @@<br>
 #endif<br>
<br>
     lldb::TypeNameSpecifierImplSP<br>
-    GetTypeNameSpecifierForSummaryAtIndex (uint32_t index)<br>
+    GetTypeNameSpecifierForSummaryAtIndex (size_t index)<br>
     {<br>
         if (index < m_summary_nav->GetCount())<br>
             return m_summary_nav->GetTypeNameSpecifierAtIndex(index);<br>
@@ -159,7 +159,7 @@<br>
     }<br>
<br>
     SummaryNavigator::MapValueType<br>
-    GetSummaryAtIndex (uint32_t index)<br>
+    GetSummaryAtIndex (size_t index)<br>
     {<br>
         if (index < m_summary_nav->GetCount())<br>
             return m_summary_nav->GetAtIndex(index);<br>
@@ -168,7 +168,7 @@<br>
     }<br>
<br>
     FilterNavigator::MapValueType<br>
-    GetFilterAtIndex (uint32_t index)<br>
+    GetFilterAtIndex (size_t index)<br>
     {<br>
         if (index < m_filter_nav->GetCount())<br>
             return m_filter_nav->GetAtIndex(index);<br>
@@ -177,7 +177,7 @@<br>
     }<br>
<br>
     lldb::TypeNameSpecifierImplSP<br>
-    GetTypeNameSpecifierForFilterAtIndex (uint32_t index)<br>
+    GetTypeNameSpecifierForFilterAtIndex (size_t index)<br>
     {<br>
         if (index < m_filter_nav->GetCount())<br>
             return m_filter_nav->GetTypeNameSpecifierAtIndex(index);<br>
@@ -199,7 +199,7 @@<br>
     }<br>
<br>
     SynthNavigator::MapValueType<br>
-    GetSyntheticAtIndex (uint32_t index)<br>
+    GetSyntheticAtIndex (size_t index)<br>
     {<br>
         if (index < m_synth_nav->GetCount())<br>
             return m_synth_nav->GetAtIndex(index);<br>
@@ -208,7 +208,7 @@<br>
     }<br>
<br>
     lldb::TypeNameSpecifierImplSP<br>
-    GetTypeNameSpecifierForSyntheticAtIndex (uint32_t index)<br>
+    GetTypeNameSpecifierForSyntheticAtIndex (size_t index)<br>
     {<br>
         if (index < m_synth_nav->GetCount())<br>
             return m_synth_nav->GetTypeNameSpecifierAtIndex(index);<br>
@@ -486,7 +486,7 @@<br>
     LoopThrough (CallbackType callback, void* param);<br>
<br>
     lldb::TypeCategoryImplSP<br>
-    GetAtIndex (uint32_t);<br>
+    GetAtIndex (size_t index);<br>
<br>
     bool<br>
     AnyMatches (ConstString type_name,<br>
@@ -495,7 +495,7 @@<br>
                 const char** matching_category = NULL,<br>
                 TypeCategoryImpl::FormatCategoryItems* matching_type = NULL);<br>
<br>
-    uint32_t<br>
+    size_t<br>
     GetCount ()<br>
     {<br>
         return m_map.size();<br>
@@ -615,14 +615,14 @@<br>
         return m_categories_map.Clear();<br>
     }<br>
<br>
-    uint32_t<br>
+    size_t<br>
     GetCategoriesCount ()<br>
     {<br>
         return m_categories_map.GetCount();<br>
     }<br>
<br>
     lldb::TypeCategoryImplSP<br>
-    GetCategoryAtIndex (uint32_t index)<br>
+    GetCategoryAtIndex (size_t index)<br>
     {<br>
         return m_categories_map.GetAtIndex(index);<br>
     }<br>
<br>
Modified: lldb/trunk/include/lldb/Core/FormatNavigator.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatNavigator.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/FormatNavigator.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/FormatNavigator.h (original)<br>
+++ lldb/trunk/include/lldb/Core/FormatNavigator.h Fri Jan 25 12:06:21 2013<br>
@@ -185,14 +185,14 @@<br>
         }<br>
     }<br>
<br>
-    uint32_t<br>
+    size_t<br>
     GetCount ()<br>
     {<br>
         return m_map.size();<br>
     }<br>
<br>
     ValueSP<br>
-    GetValueAtIndex (uint32_t index)<br>
+    GetValueAtIndex (size_t index)<br>
     {<br>
         Mutex::Locker locker(m_map_mutex);<br>
         MapIterator iter = m_map.begin();<br>
@@ -208,7 +208,7 @@<br>
     }<br>
<br>
     KeyType<br>
-    GetKeyAtIndex (uint32_t index)<br>
+    GetKeyAtIndex (size_t index)<br>
     {<br>
         Mutex::Locker locker(m_map_mutex);<br>
         MapIterator iter = m_map.begin();<br>
@@ -316,13 +316,13 @@<br>
     }<br>
<br>
     MapValueType<br>
-    GetAtIndex (uint32_t index)<br>
+    GetAtIndex (size_t index)<br>
     {<br>
         return m_format_map.GetValueAtIndex(index);<br>
     }<br>
<br>
     lldb::TypeNameSpecifierImplSP<br>
-    GetTypeNameSpecifierAtIndex (uint32_t index)<br>
+    GetTypeNameSpecifierAtIndex (size_t index)<br>
     {<br>
         return GetTypeNameSpecifierAtIndex_Impl(index, (KeyType*)NULL);<br>
     }<br>
@@ -339,7 +339,7 @@<br>
         m_format_map.LoopThrough(callback,param);<br>
     }<br>
<br>
-    uint32_t<br>
+    size_t<br>
     GetCount ()<br>
     {<br>
         return m_format_map.GetCount();<br>
@@ -405,7 +405,7 @@<br>
     }<br>
<br>
     lldb::TypeNameSpecifierImplSP<br>
-    GetTypeNameSpecifierAtIndex_Impl (uint32_t index, ConstString *dummy)<br>
+    GetTypeNameSpecifierAtIndex_Impl (size_t index, ConstString *dummy)<br>
     {<br>
         ConstString key = m_format_map.GetKeyAtIndex(index);<br>
         if (key)<br>
@@ -416,7 +416,7 @@<br>
     }<br>
<br>
     lldb::TypeNameSpecifierImplSP<br>
-    GetTypeNameSpecifierAtIndex_Impl (uint32_t index, lldb::RegularExpressionSP *dummy)<br>
+    GetTypeNameSpecifierAtIndex_Impl (size_t index, lldb::RegularExpressionSP *dummy)<br>
     {<br>
         lldb::RegularExpressionSP regex = m_format_map.GetKeyAtIndex(index);<br>
         if (regex.get() == NULL)<br>
<br>
Modified: lldb/trunk/include/lldb/Core/MappedHash.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/MappedHash.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/MappedHash.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/MappedHash.h (original)<br>
+++ lldb/trunk/include/lldb/Core/MappedHash.h Fri Jan 25 12:06:21 2013<br>
@@ -36,7 +36,7 @@<br>
     }<br>
<br>
     static uint32_t<br>
-    HashString (const uint8_t hash_function, const char *s)<br>
+    HashString (uint32_t hash_function, const char *s)<br>
     {<br>
         switch (hash_function)<br>
         {<br>
@@ -115,8 +115,8 @@<br>
             s.Printf ("header.header_data_len    = 0x%8.8x %u\n", header_data_len, header_data_len);<br>
         }<br>
<br>
-        virtual uint32_t<br>
-        Read (lldb_private::DataExtractor &data, uint32_t offset)<br>
+        virtual lldb::offset_t<br>
+        Read (lldb_private::DataExtractor &data, lldb::offset_t offset)<br>
         {<br>
             if (data.ValidOffsetForDataOfSize (offset,<br>
                                                sizeof (magic) +<br>
@@ -140,14 +140,14 @@<br>
                                 data.SetByteOrder(lldb::eByteOrderBig);<br>
                                 break;<br>
                             default:<br>
-                                return UINT32_MAX;<br>
+                                return LLDB_INVALID_OFFSET;<br>
                         }<br>
                     }<br>
                     else<br>
                     {<br>
                         // Magic bytes didn't match<br>
                         version = 0;<br>
-                        return UINT32_MAX;<br>
+                        return LLDB_INVALID_OFFSET;<br>
                     }<br>
                 }<br>
<br>
@@ -155,7 +155,7 @@<br>
                 if (version != 1)<br>
                 {<br>
                     // Unsupported version<br>
-                    return UINT32_MAX;<br>
+                    return LLDB_INVALID_OFFSET;<br>
                 }<br>
                 hash_function       = data.GetU16 (&offset);<br>
                 if (hash_function == 4)<br>
@@ -165,7 +165,7 @@<br>
                 header_data_len     = data.GetU32 (&offset);<br>
                 return offset;<br>
             }<br>
-            return UINT32_MAX;<br>
+            return LLDB_INVALID_OFFSET;<br>
         }<br>
 //<br>
 //        // Returns a buffer that contains a serialized version of this table<br>
@@ -379,8 +379,8 @@<br>
             m_hash_values (NULL),<br>
             m_hash_offsets (NULL)<br>
         {<br>
-            uint32_t offset = m_header.Read (data, 0);<br>
-            if (offset != UINT32_MAX && IsValid ())<br>
+            lldb::offset_t offset = m_header.Read (data, 0);<br>
+            if (offset != LLDB_INVALID_OFFSET && IsValid ())<br>
             {<br>
                 m_hash_indexes = (uint32_t *)data.GetData (&offset, m_header.bucket_count * sizeof(uint32_t));<br>
                 m_hash_values  = (uint32_t *)data.GetData (&offset, m_header.hashes_count * sizeof(uint32_t));<br>
@@ -443,10 +443,10 @@<br>
                         const uint32_t curr_hash_value = GetHashValue (hash_idx);<br>
                         if (curr_hash_value == hash_value)<br>
                         {<br>
-                            uint32_t hash_data_offset = GetHashDataOffset (hash_idx);<br>
+                            lldb::offset_t hash_data_offset = GetHashDataOffset (hash_idx);<br>
                             while (hash_data_offset != UINT32_MAX)<br>
                             {<br>
-                                const uint32_t prev_hash_data_offset = hash_data_offset;<br>
+                                const lldb::offset_t prev_hash_data_offset = hash_data_offset;<br>
                                 Result hash_result = GetHashDataForName (name, &hash_data_offset, pair);<br>
                                 // Check the result of getting our hash data<br>
                                 switch (hash_result)<br>
@@ -505,7 +505,7 @@<br>
<br>
         virtual Result<br>
         GetHashDataForName (const char *name,<br>
-                            uint32_t* hash_data_offset_ptr,<br>
+                            lldb::offset_t* hash_data_offset_ptr,<br>
                             Pair &pair) const = 0;<br>
<br>
         const HeaderType &<br>
<br>
Modified: lldb/trunk/include/lldb/Core/Module.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Module.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Module.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/Module.h (original)<br>
+++ lldb/trunk/include/lldb/Core/Module.h Fri Jan 25 12:06:21 2013<br>
@@ -247,7 +247,7 @@<br>
     /// @return<br>
     ///     The number of matches added to \a sc_list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindCompileUnits (const FileSpec &path,<br>
                       bool append,<br>
                       SymbolContextList &sc_list);<br>
@@ -284,7 +284,7 @@<br>
     /// @return<br>
     ///     The number of matches added to \a sc_list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindFunctions (const ConstString &name,<br>
                    const ClangNamespaceDecl *namespace_decl,<br>
                    uint32_t name_type_mask,<br>
@@ -315,7 +315,7 @@<br>
     /// @return<br>
     ///     The number of matches added to \a sc_list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindFunctions (const RegularExpression& regex,<br>
                    bool symbols_ok,<br>
                    bool inlines_ok,<br>
@@ -348,11 +348,11 @@<br>
     /// @return<br>
     ///     The number of matches added to \a variable_list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindGlobalVariables (const ConstString &name,<br>
                          const ClangNamespaceDecl *namespace_decl,<br>
                          bool append,<br>
-                         uint32_t max_matches,<br>
+                         size_t max_matches,<br>
                          VariableList& variable_list);<br>
<br>
     //------------------------------------------------------------------<br>
@@ -377,10 +377,10 @@<br>
     /// @return<br>
     ///     The number of matches added to \a variable_list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindGlobalVariables (const RegularExpression& regex,<br>
                          bool append,<br>
-                         uint32_t max_matches,<br>
+                         size_t max_matches,<br>
                          VariableList& variable_list);<br>
<br>
     //------------------------------------------------------------------<br>
@@ -424,11 +424,11 @@<br>
     /// @return<br>
     ///     The number of matches added to \a type_list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindTypes (const SymbolContext& sc,<br>
                const ConstString &type_name,<br>
                bool exact_match,<br>
-               uint32_t max_matches,<br>
+               size_t max_matches,<br>
                TypeList& types);<br>
<br>
     lldb::TypeSP<br>
@@ -458,11 +458,11 @@<br>
     /// @return<br>
     ///     The number of matches added to \a type_list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindTypesInNamespace (const SymbolContext& sc,<br>
                           const ConstString &type_name,<br>
                           const ClangNamespaceDecl *namespace_decl,<br>
-                          uint32_t max_matches,<br>
+                          size_t max_matches,<br>
                           TypeList& type_list);<br>
<br>
     //------------------------------------------------------------------<br>
@@ -570,11 +570,11 @@<br>
     ///     The number of compile units that the symbol vendor plug-in<br>
     ///     finds.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     GetNumCompileUnits();<br>
<br>
     lldb::CompUnitSP<br>
-    GetCompileUnitAtIndex (uint32_t);<br>
+    GetCompileUnitAtIndex (size_t idx);<br>
<br>
     const ConstString &<br>
     GetObjectName() const;<br>
@@ -963,12 +963,12 @@<br>
<br>
 private:<br>
<br>
-    uint32_t<br>
+    size_t<br>
     FindTypes_Impl (const SymbolContext& sc,<br>
                     const ConstString &name,<br>
                     const ClangNamespaceDecl *namespace_decl,<br>
                     bool append,<br>
-                    uint32_t max_matches,<br>
+                    size_t max_matches,<br>
                     TypeList& types);<br>
<br>
<br>
<br>
Modified: lldb/trunk/include/lldb/Core/ModuleList.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ModuleList.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ModuleList.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/ModuleList.h (original)<br>
+++ lldb/trunk/include/lldb/Core/ModuleList.h Fri Jan 25 12:06:21 2013<br>
@@ -165,7 +165,7 @@<br>
         return m_modules_mutex;<br>
     }<br>
<br>
-    uint32_t<br>
+    size_t<br>
     GetIndexForModule (const Module *module) const;<br>
<br>
     //------------------------------------------------------------------<br>
@@ -181,7 +181,7 @@<br>
     /// @see ModuleList::GetSize()<br>
     //------------------------------------------------------------------<br>
     lldb::ModuleSP<br>
-    GetModuleAtIndex (uint32_t idx) const;<br>
+    GetModuleAtIndex (size_t idx) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Get the module shared pointer for the module at index \a idx without<br>
@@ -198,7 +198,7 @@<br>
     /// @see ModuleList::GetSize()<br>
     //------------------------------------------------------------------<br>
     lldb::ModuleSP<br>
-    GetModuleAtIndexUnlocked (uint32_t idx) const;<br>
+    GetModuleAtIndexUnlocked (size_t idx) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Get the module pointer for the module at index \a idx.<br>
@@ -213,7 +213,7 @@<br>
     /// @see ModuleList::GetSize()<br>
     //------------------------------------------------------------------<br>
     Module*<br>
-    GetModulePointerAtIndex (uint32_t idx) const;<br>
+    GetModulePointerAtIndex (size_t idx) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Get the module pointer for the module at index \a idx without<br>
@@ -230,7 +230,7 @@<br>
     /// @see ModuleList::GetSize()<br>
     //------------------------------------------------------------------<br>
     Module*<br>
-    GetModulePointerAtIndexUnlocked (uint32_t idx) const;<br>
+    GetModulePointerAtIndexUnlocked (size_t idx) const;<br>
<br>
     //------------------------------------------------------------------<br>
     /// Find compile units by partial or full path.<br>
@@ -253,7 +253,7 @@<br>
     /// @return<br>
     ///     The number of matches added to \a sc_list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindCompileUnits (const FileSpec &path,<br>
                       bool append,<br>
                       SymbolContextList &sc_list) const;<br>
@@ -261,7 +261,7 @@<br>
     //------------------------------------------------------------------<br>
     /// @see Module::FindFunctions ()<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindFunctions (const ConstString &name,<br>
                    uint32_t name_type_mask,<br>
                    bool include_symbols,<br>
@@ -292,10 +292,10 @@<br>
     /// @return<br>
     ///     The number of matches added to \a variable_list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindGlobalVariables (const ConstString &name,<br>
                          bool append,<br>
-                         uint32_t max_matches,<br>
+                         size_t max_matches,<br>
                          VariableList& variable_list) const;<br>
<br>
     //------------------------------------------------------------------<br>
@@ -320,10 +320,10 @@<br>
     /// @return<br>
     ///     The number of matches added to \a variable_list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindGlobalVariables (const RegularExpression& regex,<br>
                          bool append,<br>
-                         uint32_t max_matches,<br>
+                         size_t max_matches,<br>
                          VariableList& variable_list) const;<br>
<br>
     //------------------------------------------------------------------<br>
@@ -422,11 +422,11 @@<br>
     /// @return<br>
     ///     The number of matches added to \a type_list.<br>
     //------------------------------------------------------------------<br>
-    uint32_t<br>
+    size_t<br>
     FindTypes (const SymbolContext& sc,<br>
                const ConstString &name,<br>
                bool name_is_fully_qualified,<br>
-               uint32_t max_matches,<br>
+               size_t max_matches,<br>
                TypeList& types) const;<br>
<br>
     bool<br>
@@ -503,7 +503,7 @@<br>
     FindSharedModules (const ModuleSpec &module_spec,<br>
                        ModuleList &matching_module_list);<br>
<br>
-    static uint32_t<br>
+    static size_t<br>
     RemoveOrphanSharedModules (bool mandatory);<br>
<br>
     static bool<br>
<br>
Modified: lldb/trunk/include/lldb/Core/PluginManager.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/PluginManager.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/PluginManager.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/PluginManager.h (original)<br>
+++ lldb/trunk/include/lldb/Core/PluginManager.h Fri Jan 25 12:06:21 2013<br>
@@ -216,7 +216,7 @@<br>
     static const char *<br>
     GetPlatformPluginDescriptionAtIndex (uint32_t idx);<br>
<br>
-    static uint32_t<br>
+    static size_t<br>
     AutoCompletePlatformName (const char *partial_name,<br>
                               StringList &matches);<br>
     //------------------------------------------------------------------<br>
<br>
Modified: lldb/trunk/include/lldb/Core/RegisterValue.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/RegisterValue.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/RegisterValue.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/RegisterValue.h (original)<br>
+++ lldb/trunk/include/lldb/Core/RegisterValue.h Fri Jan 25 12:06:21 2013<br>
@@ -345,7 +345,7 @@<br>
         Error<br>
         SetValueFromData (const RegisterInfo *reg_info,<br>
                           DataExtractor &data,<br>
-                          uint32_t offset,<br>
+                          lldb::offset_t offset,<br>
                           bool partial_data_ok);<br>
<br>
         // The default value of 0 for reg_name_right_align_at means no alignment at all.<br>
<br>
Modified: lldb/trunk/include/lldb/Core/Scalar.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Scalar.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Scalar.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/Scalar.h (original)<br>
+++ lldb/trunk/include/lldb/Core/Scalar.h Fri Jan 25 12:06:21 2013<br>
@@ -73,9 +73,9 @@<br>
     bool<br>
     GetData (DataExtractor &data, size_t limit_byte_size = UINT32_MAX) const;<br>
<br>
-    uint32_t<br>
+    size_t<br>
     GetAsMemoryData (void *dst,<br>
-                     uint32_t dst_len,<br>
+                     size_t dst_len,<br>
                      lldb::ByteOrder dst_byte_order,<br>
                      Error &error) const;<br>
<br>
@@ -219,7 +219,7 @@<br>
     GetRawBits64 (uint64_t fail_value) const;<br>
<br>
     Error<br>
-    SetValueFromCString (const char *s, lldb::Encoding encoding, uint32_t byte_size);<br>
+    SetValueFromCString (const char *s, lldb::Encoding encoding, size_t byte_size);<br>
<br>
     static bool<br>
     UIntValueIsValidForSize (uint64_t uval64, size_t total_byte_size)<br>
@@ -249,6 +249,16 @@<br>
     }<br>
<br>
 protected:<br>
+    typedef int                 sint_t;<br>
+    typedef unsigned int        uint_t;<br>
+    typedef long                slong_t;<br>
+    typedef unsigned long       ulong_t;<br>
+    typedef long long           slonglong_t;<br>
+    typedef unsigned long long  ulonglong_t;<br>
+    typedef float               float_t;<br>
+    typedef double              double_t;<br>
+    typedef long double         long_double_t;<br>
+<br>
     union ValueData<br>
     {<br>
         int                 sint;<br>
<br>
Modified: lldb/trunk/include/lldb/Core/Section.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Section.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Section.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/Section.h (original)<br>
+++ lldb/trunk/include/lldb/Core/Section.h Fri Jan 25 12:06:21 2013<br>
@@ -34,13 +34,13 @@<br>
     virtual<br>
     ~SectionList();<br>
<br>
-    uint32_t<br>
+    size_t<br>
     AddSection (const lldb::SectionSP& section_sp);<br>
<br>
-    uint32_t<br>
+    size_t<br>
     AddUniqueSection (const lldb::SectionSP& section_sp);<br>
<br>
-    uint32_t<br>
+    size_t<br>
     FindSectionIndex (const Section* sect);<br>
<br>
     bool<br>
@@ -56,7 +56,7 @@<br>
     FindSectionByID (lldb::user_id_t sect_id) const;<br>
<br>
     lldb::SectionSP<br>
-    FindSectionByType (lldb::SectionType sect_type, bool check_children, uint32_t start_idx = 0) const;<br>
+    FindSectionByType (lldb::SectionType sect_type, bool check_children, size_t start_idx = 0) const;<br>
<br>
     lldb::SectionSP<br>
     FindSectionContainingFileAddress (lldb::addr_t addr, uint32_t depth = UINT32_MAX) const;<br>
@@ -82,7 +82,7 @@<br>
     ReplaceSection (lldb::user_id_t sect_id, const lldb::SectionSP& section_sp, uint32_t depth = UINT32_MAX);<br>
<br>
     lldb::SectionSP<br>
-    GetSectionAtIndex (uint32_t idx) const;<br>
+    GetSectionAtIndex (size_t idx) const;<br>
<br>
     size_t<br>
     Slide (lldb::addr_t slide_amount, bool slide_children);<br>
<br>
Modified: lldb/trunk/include/lldb/Core/Stream.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Stream.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Stream.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/Stream.h (original)<br>
+++ lldb/trunk/include/lldb/Core/Stream.h Fri Jan 25 12:06:21 2013<br>
@@ -87,13 +87,13 @@<br>
     /// @return<br>
     ///     The number of bytes that were appended to the stream.<br>
     //------------------------------------------------------------------<br>
-    virtual int<br>
+    virtual size_t<br>
     Write (const void *src, size_t src_len) = 0;<br>
<br>
     //------------------------------------------------------------------<br>
     // Member functions<br>
     //------------------------------------------------------------------<br>
-    int<br>
+    size_t<br>
     PutChar (char ch);<br>
<br>
     //------------------------------------------------------------------<br>
@@ -125,7 +125,7 @@<br>
     /// @return<br>
     ///     The number of bytes that were appended to the stream.<br>
     //------------------------------------------------------------------<br>
-    int<br>
+    size_t<br>
     PrintfAsRawHex8 (const char *format, ...)  __attribute__ ((format (printf, 2, 3)));<br>
<br>
     //------------------------------------------------------------------<br>
@@ -142,59 +142,59 @@<br>
     /// @return<br>
     ///     The number of bytes that were appended to the stream.<br>
     //------------------------------------------------------------------<br>
-    int<br>
+    size_t<br>
     PutHex8 (uint8_t uvalue);<br>
<br>
-    int<br>
+    size_t<br>
     PutNHex8 (size_t n, uint8_t uvalue);<br>
<br>
-    int<br>
+    size_t<br>
     PutHex16 (uint16_t uvalue,<br>
               lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);<br>
<br>
-    int<br>
+    size_t<br>
     PutHex32 (uint32_t uvalue,<br>
               lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);<br>
<br>
-    int<br>
+    size_t<br>
     PutHex64 (uint64_t uvalue,<br>
               lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);<br>
<br>
-    int<br>
+    size_t<br>
     PutMaxHex64 (uint64_t uvalue,<br>
                  size_t byte_size,<br>
                  lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);<br>
-    int<br>
+    size_t<br>
     PutFloat (float f,<br>
               lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);<br>
<br>
-    int<br>
+    size_t<br>
     PutDouble (double d,<br>
                lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);<br>
<br>
-    int<br>
+    size_t<br>
     PutLongDouble (long double ld,<br>
                    lldb::ByteOrder byte_order = lldb::eByteOrderInvalid);<br>
<br>
-    int<br>
+    size_t<br>
     PutPointer (void *ptr);<br>
<br>
     // Append \a src_len bytes from \a src to the stream as hex characters<br>
     // (two ascii characters per byte of input data)<br>
-    int<br>
+    size_t<br>
     PutBytesAsRawHex8 (const void *src,<br>
                        size_t src_len,<br>
                        lldb::ByteOrder src_byte_order = lldb::eByteOrderInvalid,<br>
                        lldb::ByteOrder dst_byte_order = lldb::eByteOrderInvalid);<br>
<br>
     // Append \a src_len bytes from \a s to the stream as binary data.<br>
-    int<br>
+    size_t<br>
     PutRawBytes (const void *s,<br>
                  size_t src_len,<br>
                  lldb::ByteOrder src_byte_order = lldb::eByteOrderInvalid,<br>
                  lldb::ByteOrder dst_byte_order = lldb::eByteOrderInvalid);<br>
<br>
-    int<br>
+    size_t<br>
     PutCStringAsRawHex8 (const char *s);<br>
<br>
     //------------------------------------------------------------------<br>
@@ -359,7 +359,7 @@<br>
     ///     A suffix C string. If NULL, no suffix will be output.<br>
     //------------------------------------------------------------------<br>
     void<br>
-    Address (uint64_t addr, int addr_size, const char *prefix = NULL, const char *suffix = NULL);<br>
+    Address (uint64_t addr, uint32_t addr_size, const char *prefix = NULL, const char *suffix = NULL);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Output an address range to this stream.<br>
@@ -383,7 +383,7 @@<br>
     ///     A suffix C string. If NULL, no suffix will be output.<br>
     //------------------------------------------------------------------<br>
     void<br>
-    AddressRange(uint64_t lo_addr, uint64_t hi_addr, int addr_size, const char *prefix = NULL, const char *suffix = NULL);<br>
+    AddressRange(uint64_t lo_addr, uint64_t hi_addr, uint32_t addr_size, const char *prefix = NULL, const char *suffix = NULL);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Output a C string to the stream.<br>
@@ -393,13 +393,13 @@<br>
     /// @param[in] cstr<br>
     ///     The string to be output to the stream.<br>
     //------------------------------------------------------------------<br>
-    int<br>
+    size_t<br>
     PutCString (const char *cstr);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Output and End of Line character to the stream.<br>
     //------------------------------------------------------------------<br>
-    int<br>
+    size_t<br>
     EOL();<br>
<br>
     //------------------------------------------------------------------<br>
@@ -409,7 +409,7 @@<br>
     ///     The size of an address in bytes that is used when outputting<br>
     ///     address and pointer values to the stream.<br>
     //------------------------------------------------------------------<br>
-    uint8_t<br>
+    uint32_t<br>
     GetAddressByteSize () const;<br>
<br>
     //------------------------------------------------------------------<br>
@@ -478,7 +478,7 @@<br>
     ///     A C string to print following the indentation. If NULL, just<br>
     ///     output the indentation characters.<br>
     //------------------------------------------------------------------<br>
-    int<br>
+    size_t<br>
     Indent(const char *s = NULL);<br>
<br>
     //------------------------------------------------------------------<br>
@@ -520,10 +520,10 @@<br>
     ///     Variable arguments that are needed for the printf style<br>
     ///     format string \a format.<br>
     //------------------------------------------------------------------<br>
-    int<br>
+    size_t<br>
     Printf (const char *format, ...)  __attribute__ ((format (printf, 2, 3)));<br>
<br>
-    int<br>
+    size_t<br>
     PrintfVarArg(const char *format, va_list args);<br>
<br>
     //------------------------------------------------------------------<br>
@@ -549,7 +549,7 @@<br>
     ///     address and pointer values.<br>
     //------------------------------------------------------------------<br>
     void<br>
-    SetAddressByteSize (uint8_t addr_size);<br>
+    SetAddressByteSize (uint32_t addr_size);<br>
<br>
     //------------------------------------------------------------------<br>
     /// Set the current indentation level.<br>
@@ -572,7 +572,7 @@<br>
     /// @param[in] format<br>
     ///     The optional printf format that can be overridden.<br>
     //------------------------------------------------------------------<br>
-    int<br>
+    size_t<br>
     PutSLEB128 (int64_t uval);<br>
<br>
     //------------------------------------------------------------------<br>
@@ -587,7 +587,7 @@<br>
     /// @param[in] format<br>
     ///     The optional printf format that can be overridden.<br>
     //------------------------------------------------------------------<br>
-    int<br>
+    size_t<br>
     PutULEB128 (uint64_t uval);<br>
<br>
     static void<br>
@@ -597,12 +597,12 @@<br>
     //------------------------------------------------------------------<br>
     // Member variables<br>
     //------------------------------------------------------------------<br>
-    Flags m_flags;      ///< Dump flags.<br>
-    uint8_t m_addr_size;    ///< Size of an address in bytes.<br>
-    lldb::ByteOrder m_byte_order;///< Byte order to use when encoding scalar types.<br>
-    int m_indent_level;     ///< Indention level.<br>
+    Flags m_flags;                  ///< Dump flags.<br>
+    uint32_t m_addr_size;           ///< Size of an address in bytes.<br>
+    lldb::ByteOrder m_byte_order;   ///< Byte order to use when encoding scalar types.<br>
+    int m_indent_level;             ///< Indention level.<br>
<br>
-    int _PutHex8 (uint8_t uvalue, bool add_prefix);<br>
+    size_t _PutHex8 (uint8_t uvalue, bool add_prefix);<br>
 };<br>
<br>
 } // namespace lldb_private<br>
<br>
Modified: lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h (original)<br>
+++ lldb/trunk/include/lldb/Core/StreamAsynchronousIO.h Fri Jan 25 12:06:21 2013<br>
@@ -28,7 +28,7 @@<br>
     virtual void<br>
     Flush ();<br>
<br>
-    virtual int<br>
+    virtual size_t<br>
     Write (const void *src, size_t src_len);<br>
<br>
<br>
<br>
Modified: lldb/trunk/include/lldb/Core/StreamBuffer.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamBuffer.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamBuffer.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/StreamBuffer.h (original)<br>
+++ lldb/trunk/include/lldb/Core/StreamBuffer.h Fri Jan 25 12:06:21 2013<br>
@@ -47,7 +47,7 @@<br>
         // Nothing to do when flushing a buffer based stream...<br>
     }<br>
<br>
-    virtual int<br>
+    virtual size_t<br>
     Write (const void *s, size_t length)<br>
     {<br>
         if (s && length)<br>
<br>
Modified: lldb/trunk/include/lldb/Core/StreamCallback.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamCallback.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamCallback.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/StreamCallback.h (original)<br>
+++ lldb/trunk/include/lldb/Core/StreamCallback.h Fri Jan 25 12:06:21 2013<br>
@@ -29,7 +29,7 @@<br>
     virtual void<br>
     Flush ();<br>
<br>
-    virtual int<br>
+    virtual size_t<br>
     Write (const void *src, size_t src_len);<br>
<br>
<br>
<br>
Modified: lldb/trunk/include/lldb/Core/StreamFile.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamFile.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamFile.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/StreamFile.h (original)<br>
+++ lldb/trunk/include/lldb/Core/StreamFile.h Fri Jan 25 12:06:21 2013<br>
@@ -57,7 +57,7 @@<br>
     virtual void<br>
     Flush ();<br>
<br>
-    virtual int<br>
+    virtual size_t<br>
     Write (const void *s, size_t length);<br>
<br>
 protected:<br>
<br>
Modified: lldb/trunk/include/lldb/Core/StreamString.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamString.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamString.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/StreamString.h (original)<br>
+++ lldb/trunk/include/lldb/Core/StreamString.h Fri Jan 25 12:06:21 2013<br>
@@ -31,7 +31,7 @@<br>
     virtual void<br>
     Flush ();<br>
<br>
-    virtual int<br>
+    virtual size_t<br>
     Write (const void *s, size_t length);<br>
<br>
     void<br>
<br>
Modified: lldb/trunk/include/lldb/Core/StreamTee.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamTee.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StreamTee.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/StreamTee.h (original)<br>
+++ lldb/trunk/include/lldb/Core/StreamTee.h Fri Jan 25 12:06:21 2013<br>
@@ -93,14 +93,14 @@<br>
         }<br>
     }<br>
<br>
-    virtual int<br>
+    virtual size_t<br>
     Write (const void *s, size_t length)<br>
     {<br>
         Mutex::Locker locker (m_streams_mutex);<br>
         if (m_streams.empty())<br>
             return 0;<br>
<br>
-        int min_bytes_written = INT_MAX;<br>
+        size_t min_bytes_written = SIZE_MAX;<br>
         collection::iterator pos, end;<br>
         for (pos = m_streams.begin(), end = m_streams.end(); pos != end; ++pos)<br>
         {<br>
@@ -111,11 +111,13 @@<br>
             Stream *strm = pos->get();<br>
             if (strm)<br>
             {<br>
-                int bytes_written = strm->Write (s, length);<br>
+                const size_t bytes_written = strm->Write (s, length);<br>
                 if (min_bytes_written > bytes_written)<br>
                     min_bytes_written = bytes_written;<br>
             }<br>
         }<br>
+        if (min_bytes_written == SIZE_MAX)<br>
+            return 0;<br>
         return min_bytes_written;<br>
     }<br>
<br>
<br>
Modified: lldb/trunk/include/lldb/Core/StringList.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StringList.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/StringList.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/StringList.h (original)<br>
+++ lldb/trunk/include/lldb/Core/StringList.h Fri Jan 25 12:06:21 2013<br>
@@ -48,7 +48,7 @@<br>
     bool<br>
     ReadFileLines (FileSpec &input_file);<br>
<br>
-    uint32_t<br>
+    size_t<br>
     GetSize () const;<br>
<br>
     const char *<br>
<br>
Modified: lldb/trunk/include/lldb/Core/VMRange.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/VMRange.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/VMRange.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/VMRange.h (original)<br>
+++ lldb/trunk/include/lldb/Core/VMRange.h Fri Jan 25 12:06:21 2013<br>
@@ -161,7 +161,7 @@<br>
<br>
     // Returns a valid index into coll when a match is found, else UINT32_MAX<br>
     // is returned<br>
-    static uint32_t<br>
+    static size_t<br>
     FindRangeIndexThatContainsValue (const VMRange::collection& coll, lldb::addr_t value);<br>
<br>
 protected:<br>
<br>
Modified: lldb/trunk/include/lldb/Core/Value.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Value.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Value.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/Value.h (original)<br>
+++ lldb/trunk/include/lldb/Core/Value.h Fri Jan 25 12:06:21 2013<br>
@@ -213,7 +213,7 @@<br>
     }<br>
<br>
     void<br>
-    ResizeData(int len);<br>
+    ResizeData(size_t len);<br>
<br>
     bool<br>
     ValueOf(ExecutionContext *exe_ctx, clang::ASTContext *ast_context);<br>
<br>
Modified: lldb/trunk/include/lldb/Core/ValueObject.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObject.h?rev=173463&r1=173462&r2=173463&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ValueObject.h?rev=173463&r1=173462&r2=173463&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/include/lldb/Core/ValueObject.h (original)<br>
+++ lldb/trunk/include/lldb/Core/ValueObject.h Fri Jan 25 12:06:21 2013<br>
@@ -732,32 +732,32 @@<br>
     GetName() const;<br>
<br>
     virtual lldb::ValueObjectSP<br>
-    GetChildAtIndex (uint32_t idx, bool can_create);<br>
+    GetChildAtIndex (size_t idx, bool can_create);<br>
<br>
     // this will always create the children if necessary<br>
     lldb::ValueObjectSP<br>
-    GetChildAtIndexPath (const std::initializer_list<uint32_t> &idxs,<br>
-                         uint32_t* index_of_error = NULL);<br>
+    GetChildAtIndexPath (const std::initializer_list<size_t> &idxs,<br>
+                         size_t* index_of_error = NULL);<br>
<br>
     lldb::ValueObjectSP<br>
-    GetChildAtIndexPath (const std::vector<uint32_t> &idxs,<br>
-                         uint32_t* index_of_error = NULL);<br>
+    GetChildAtIndexPath (const std::vector<size_t> &idxs,<br>
+                         size_t* index_of_error = NULL);<br>
<br>
     lldb::ValueObjectSP<br>
-    GetChildAtIndexPath (const std::initializer_list< std::pair<uint32_t, bool> > &idxs,<br>
-                         uint32_t* index_of_error = NULL);<br>
+    GetChildAtIndexPath (const std::initializer_list< std::pair<size_t, bool> > &idxs,<br>
+                         size_t* index_of_error = NULL);<br>
<br>
     lldb::ValueObjectSP<br>
-    GetChildAtIndexPath (const std::vector< std::pair<uint32_t, bool> > &idxs,<br>
-                         uint32_t* index_of_error = NULL);<br>
+    GetChildAtIndexPath (const std::vector< std::pair<size_t, bool> > &idxs,<br>
+                         size_t* index_of_error = NULL);<br>
<br>
     virtual lldb::ValueObjectSP<br>
     GetChildMemberWithName (const ConstString &name, bool can_create);<br>
<br>
-    virtual uint32_t<br>
+    virtual size_t<br>
     GetIndexOfChildWithName (const ConstString &name);<br>
<br>
-    uint32_t<br>
+    size_t<br>
     GetNumChildren ();<br>
<br>
     const Value &<br>
@@ -833,13 +833,13 @@<br>
     GetSyntheticChild (const ConstString &key) const;<br>
<br>
     lldb::ValueObjectSP<br>
-    GetSyntheticArrayMember (int32_t index, bool can_create);<br>
+    GetSyntheticArrayMember (size_t index, bool can_create);<br>
<br>
     lldb::ValueObjectSP<br>
-    GetSyntheticArrayMemberFromPointer (int32_t index, bool can_create);<br>
+    GetSyntheticArrayMemberFromPointer (size_t index, bool can_create);<br>
<br>
     lldb::ValueObjectSP<br>
-    GetSyntheticArrayMemberFromArray (int32_t index, bool can_create);<br>
+    GetSyntheticArrayMemberFromArray (size_t index, bool can_create);<br>
<br>
     lldb::ValueObjectSP<br>
     GetSyntheticBitFieldChild (uint32_t from, uint32_t to, bool can_create);<br>
@@ -1117,13 +1117,13 @@<br>
     {<br>
     public:<br>
         ChildrenManager() :<br>
-        m_mutex(Mutex::eMutexTypeRecursive),<br>
-        m_children(),<br>
-        m_children_count(0)<br>
+            m_mutex(Mutex::eMutexTypeRecursive),<br>
+            m_children(),<br>
+            m_children_count(0)<br>
         {}<br>
<br>
         bool<br>
-        HasChildAtIndex (uint32_t idx)<br>
+        HasChildAtIndex (size_t idx)<br>
         {<br>
             Mutex::Locker locker(m_mutex);<br>
             ChildrenIterator iter = m_children.find(idx);<br>
@@ -1132,7 +1132,7 @@<br>
         }<br>
<br>
         ValueObject*<br>
-        GetChildAtIndex (uint32_t idx)<br>
+        GetChildAtIndex (size_t idx)<br>
         {<br>
             Mutex::Locker locker(m_mutex);<br>
             ChildrenIterator iter = m_children.find(idx);<br>
@@ -1144,7 +1144,7 @@<br>
         }<br>
<br>
         void<br>
-        SetChildAtIndex (uint32_t idx, ValueObject* valobj)<br>
+        SetChildAtIndex (size_t idx, ValueObject* valobj)<br>
         {<br>
             ChildrenPair pair(idx,valobj); // we do not need to be mutex-protected to make a pair<br>
             Mutex::Locker locker(m_mutex);<br>
@@ -1152,12 +1152,12 @@<br>
         }<br>
<br>
         void<br>
-        SetChildrenCount (uint32_t count)<br>
+        SetChildrenCount (size_t count)<br>
         {<br>
             m_children_count = count;<br>
         }<br>
<br>
-        uint32_t<br>
+        size_t<br>
         GetChildrenCount ()<br>
         {<br>
             return m_children_count;<br>
@@ -1172,12 +1172,12 @@<br>
         }<br>
<br>
     private:<br>
-        typedef std::map<uint32_t, ValueObject*> ChildrenMap;<br>
+        typedef std::map<size_t, ValueObject*> ChildrenMap;<br>
         typedef ChildrenMap::iterator ChildrenIterator;<br>
         typedef ChildrenMap::value_type ChildrenPair;<br>
         Mutex m_mutex;<br>
         ChildrenMap m_children;<br>
-        uint32_t m_children_count;<br>
+        size_t m_children_count;<br>
     };<br>
<br>
     //-----------------------------------------------------...<br><br>[Message clipped]  </blockquote></div><br></div>