Removed the SymbolLookup dependency in debug_next_image_symbol().
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30158 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -11,6 +11,7 @@
|
|||||||
#include <debug_support.h>
|
#include <debug_support.h>
|
||||||
|
|
||||||
#include "arch_debug_support.h"
|
#include "arch_debug_support.h"
|
||||||
|
#include "Image.h"
|
||||||
#include "SymbolLookup.h"
|
#include "SymbolLookup.h"
|
||||||
|
|
||||||
|
|
||||||
@@ -22,7 +23,6 @@ struct debug_symbol_lookup_context {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct debug_symbol_iterator : BPrivate::Debug::SymbolIterator {
|
struct debug_symbol_iterator : BPrivate::Debug::SymbolIterator {
|
||||||
debug_symbol_lookup_context* lookup_context;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
@@ -397,8 +397,6 @@ debug_create_image_symbol_iterator(debug_symbol_lookup_context* lookupContext,
|
|||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
iterator->lookup_context = lookupContext;
|
|
||||||
|
|
||||||
*_iterator = iterator;
|
*_iterator = iterator;
|
||||||
return B_OK;
|
return B_OK;
|
||||||
}
|
}
|
||||||
@@ -417,18 +415,15 @@ debug_next_image_symbol(debug_symbol_iterator* iterator, char* nameBuffer,
|
|||||||
size_t nameBufferLength, int32* _symbolType, void** _symbolLocation,
|
size_t nameBufferLength, int32* _symbolType, void** _symbolLocation,
|
||||||
size_t* _symbolSize)
|
size_t* _symbolSize)
|
||||||
{
|
{
|
||||||
if (iterator == NULL || iterator->lookup_context == NULL
|
if (iterator == NULL || iterator->image == NULL)
|
||||||
|| iterator->lookup_context->lookup == NULL) {
|
|
||||||
return B_BAD_VALUE;
|
return B_BAD_VALUE;
|
||||||
}
|
|
||||||
debug_symbol_lookup_context* lookupContext = iterator->lookup_context;
|
|
||||||
|
|
||||||
const char* symbolName;
|
const char* symbolName;
|
||||||
size_t symbolNameLen;
|
size_t symbolNameLen;
|
||||||
addr_t symbolLocation;
|
addr_t symbolLocation;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
status_t error = lookupContext->lookup->NextSymbol(*iterator,
|
status_t error = iterator->image->NextSymbol(iterator->currentIndex,
|
||||||
&symbolName, &symbolNameLen, &symbolLocation, _symbolSize,
|
&symbolName, &symbolNameLen, &symbolLocation, _symbolSize,
|
||||||
_symbolType);
|
_symbolType);
|
||||||
if (error != B_OK)
|
if (error != B_OK)
|
||||||
|
|||||||
Reference in New Issue
Block a user