Use physical address in debug messages; they make more sense to read.
This commit is contained in:
parent
7ad1c2eaa8
commit
d9204ef676
|
@ -160,8 +160,10 @@ int fill_buffer ( struct buffer *buffer, const void *data,
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
DBGC ( buffer, "BUFFER %p [%lx,%lx) filling portion [%lx,%lx)\n",
|
DBGC ( buffer, "BUFFER %p [%lx,%lx) filling portion [%lx,%lx)\n",
|
||||||
buffer, buffer->addr, ( buffer->addr + buffer->len ),
|
buffer, user_to_phys ( buffer->addr, 0 ),
|
||||||
( buffer->addr + data_start ), ( buffer->addr + data_end ) );
|
user_to_phys ( buffer->addr, buffer->len ),
|
||||||
|
user_to_phys ( buffer->addr, data_start ),
|
||||||
|
user_to_phys ( buffer->addr, data_end ) );
|
||||||
|
|
||||||
/* Check that block fits within buffer, expand if necessary */
|
/* Check that block fits within buffer, expand if necessary */
|
||||||
if ( data_end > buffer->len ) {
|
if ( data_end > buffer->len ) {
|
||||||
|
@ -175,7 +177,8 @@ int fill_buffer ( struct buffer *buffer, const void *data,
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
DBGC ( buffer, "BUFFER %p expanded to [%lx,%lx)\n", buffer,
|
DBGC ( buffer, "BUFFER %p expanded to [%lx,%lx)\n", buffer,
|
||||||
buffer->addr, ( buffer->addr + buffer->len ) );
|
user_to_phys ( buffer->addr, 0 ),
|
||||||
|
user_to_phys ( buffer->addr, buffer->len ) );
|
||||||
assert ( buffer->len >= data_end );
|
assert ( buffer->len >= data_end );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -202,16 +205,17 @@ int fill_buffer ( struct buffer *buffer, const void *data,
|
||||||
before.next = after.start;
|
before.next = after.start;
|
||||||
|
|
||||||
DBGC ( buffer, "BUFFER %p split before [%lx,%lx) after [%lx,%lx)\n",
|
DBGC ( buffer, "BUFFER %p split before [%lx,%lx) after [%lx,%lx)\n",
|
||||||
buffer, ( buffer->addr + before.start ),
|
buffer, user_to_phys ( buffer->addr, before.start ),
|
||||||
( buffer->addr + before.end ), ( buffer->addr + after.start ),
|
user_to_phys ( buffer->addr, before.end ),
|
||||||
( buffer->addr + after.end ) );
|
user_to_phys ( buffer->addr, after.start ),
|
||||||
|
user_to_phys ( buffer->addr, after.end ) );
|
||||||
|
|
||||||
/* Write back 'before' block, if any */
|
/* Write back 'before' block, if any */
|
||||||
if ( before.end == 0 ) {
|
if ( before.end == 0 ) {
|
||||||
/* No 'before' block: update buffer->fill */
|
/* No 'before' block: update buffer->fill */
|
||||||
buffer->fill = after.start;
|
buffer->fill = after.start;
|
||||||
DBGC ( buffer, "BUFFER %p full up to %lx\n", buffer,
|
DBGC ( buffer, "BUFFER %p full up to %lx\n", buffer,
|
||||||
( buffer->addr + buffer->fill ) );
|
user_to_phys ( buffer->addr, buffer->fill ) );
|
||||||
} else {
|
} else {
|
||||||
/* Write back 'before' block */
|
/* Write back 'before' block */
|
||||||
store_free_block ( buffer, &before );
|
store_free_block ( buffer, &before );
|
||||||
|
@ -222,7 +226,7 @@ int fill_buffer ( struct buffer *buffer, const void *data,
|
||||||
/* 'After' block is the final block: update buffer->free */
|
/* 'After' block is the final block: update buffer->free */
|
||||||
buffer->free = after.start;
|
buffer->free = after.start;
|
||||||
DBGC ( buffer, "BUFFER %p free from %lx onwards\n", buffer,
|
DBGC ( buffer, "BUFFER %p free from %lx onwards\n", buffer,
|
||||||
( buffer->addr + buffer->free ) );
|
user_to_phys ( buffer->addr, buffer->free ) );
|
||||||
} else {
|
} else {
|
||||||
/* Write back 'after' block */
|
/* Write back 'after' block */
|
||||||
store_free_block ( buffer, &after );
|
store_free_block ( buffer, &after );
|
||||||
|
|
Reference in New Issue