Browse Source

Use physical address in debug messages; they make more sense to read.

tags/v0.9.3
Michael Brown 18 years ago
parent
commit
d9204ef676
1 changed files with 12 additions and 8 deletions
  1. 12
    8
      src/core/buffer.c

+ 12
- 8
src/core/buffer.c View File

160
 	int rc;
160
 	int rc;
161
 
161
 
162
 	DBGC ( buffer, "BUFFER %p [%lx,%lx) filling portion [%lx,%lx)\n",
162
 	DBGC ( buffer, "BUFFER %p [%lx,%lx) filling portion [%lx,%lx)\n",
163
-	       buffer, buffer->addr, ( buffer->addr + buffer->len ),
164
-	       ( buffer->addr + data_start ), ( buffer->addr + data_end ) );
163
+	       buffer, user_to_phys ( buffer->addr, 0 ),
164
+	       user_to_phys ( buffer->addr, buffer->len ),
165
+	       user_to_phys ( buffer->addr, data_start ),
166
+	       user_to_phys ( buffer->addr, data_end ) );
165
 
167
 
166
 	/* Check that block fits within buffer, expand if necessary */
168
 	/* Check that block fits within buffer, expand if necessary */
167
 	if ( data_end > buffer->len ) {
169
 	if ( data_end > buffer->len ) {
175
 			return rc;
177
 			return rc;
176
 		}
178
 		}
177
 		DBGC ( buffer, "BUFFER %p expanded to [%lx,%lx)\n", buffer,
179
 		DBGC ( buffer, "BUFFER %p expanded to [%lx,%lx)\n", buffer,
178
-		       buffer->addr, ( buffer->addr + buffer->len ) );
180
+		       user_to_phys ( buffer->addr, 0 ),
181
+		       user_to_phys ( buffer->addr, buffer->len ) );
179
 		assert ( buffer->len >= data_end );
182
 		assert ( buffer->len >= data_end );
180
 	}
183
 	}
181
 
184
 
202
 	before.next = after.start;
205
 	before.next = after.start;
203
 
206
 
204
 	DBGC ( buffer, "BUFFER %p split before [%lx,%lx) after [%lx,%lx)\n",
207
 	DBGC ( buffer, "BUFFER %p split before [%lx,%lx) after [%lx,%lx)\n",
205
-	       buffer, ( buffer->addr + before.start ),
206
-	       ( buffer->addr + before.end ), ( buffer->addr + after.start ),
207
-	       ( buffer->addr + after.end ) );
208
+	       buffer, user_to_phys ( buffer->addr, before.start ),
209
+	       user_to_phys ( buffer->addr, before.end ),
210
+	       user_to_phys ( buffer->addr, after.start ),
211
+	       user_to_phys ( buffer->addr, after.end ) );
208
 
212
 
209
 	/* Write back 'before' block, if any */
213
 	/* Write back 'before' block, if any */
210
 	if ( before.end == 0 ) {
214
 	if ( before.end == 0 ) {
211
 		/* No 'before' block: update buffer->fill */
215
 		/* No 'before' block: update buffer->fill */
212
 		buffer->fill = after.start;
216
 		buffer->fill = after.start;
213
 		DBGC ( buffer, "BUFFER %p full up to %lx\n", buffer,
217
 		DBGC ( buffer, "BUFFER %p full up to %lx\n", buffer,
214
-		       ( buffer->addr + buffer->fill ) );
218
+		       user_to_phys ( buffer->addr, buffer->fill ) );
215
 	} else {
219
 	} else {
216
 		/* Write back 'before' block */
220
 		/* Write back 'before' block */
217
 		store_free_block ( buffer, &before );
221
 		store_free_block ( buffer, &before );
222
 		/* 'After' block is the final block: update buffer->free */
226
 		/* 'After' block is the final block: update buffer->free */
223
 		buffer->free = after.start;
227
 		buffer->free = after.start;
224
 		DBGC ( buffer, "BUFFER %p free from %lx onwards\n", buffer,
228
 		DBGC ( buffer, "BUFFER %p free from %lx onwards\n", buffer,
225
-		       ( buffer->addr + buffer->free ) );
229
+		       user_to_phys ( buffer->addr, buffer->free ) );
226
 	} else {
230
 	} else {
227
 		/* Write back 'after' block */
231
 		/* Write back 'after' block */
228
 		store_free_block ( buffer, &after );
232
 		store_free_block ( buffer, &after );

Loading…
Cancel
Save