Deleted Added
full compact
kvm_minidump_amd64.c (215133) kvm_minidump_amd64.c (217744)
1/*-
2 * Copyright (c) 2006 Peter Wemm
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 10 unchanged lines hidden (view full) ---

19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2006 Peter Wemm
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

--- 10 unchanged lines hidden (view full) ---

19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27__FBSDID("$FreeBSD: head/lib/libkvm/kvm_minidump_amd64.c 215133 2010-11-11 18:35:28Z avg $");
27__FBSDID("$FreeBSD: head/lib/libkvm/kvm_minidump_amd64.c 217744 2011-01-23 11:08:28Z uqs $");
28
29/*
30 * AMD64 machine dependent routines for kvm and minidumps.
31 */
32
33#include <sys/param.h>
34#include <sys/user.h>
35#include <sys/proc.h>

--- 95 unchanged lines hidden (view full) ---

131 free(vm->page_map);
132 free(vm);
133 kd->vmst = NULL;
134}
135
136int
137_kvm_minidump_initvtop(kvm_t *kd)
138{
28
29/*
30 * AMD64 machine dependent routines for kvm and minidumps.
31 */
32
33#include <sys/param.h>
34#include <sys/user.h>
35#include <sys/proc.h>

--- 95 unchanged lines hidden (view full) ---

131 free(vm->page_map);
132 free(vm);
133 kd->vmst = NULL;
134}
135
136int
137_kvm_minidump_initvtop(kvm_t *kd)
138{
139 u_long pa;
140 struct vmstate *vmst;
141 off_t off;
142
143 vmst = _kvm_malloc(kd, sizeof(*vmst));
144 if (vmst == 0) {
145 _kvm_err(kd, kd->program, "cannot allocate vm");
146 return (-1);
147 }

--- 54 unchanged lines hidden (view full) ---

202
203static int
204_kvm_minidump_vatop_v1(kvm_t *kd, u_long va, off_t *pa)
205{
206 struct vmstate *vm;
207 u_long offset;
208 pt_entry_t pte;
209 u_long pteindex;
139 struct vmstate *vmst;
140 off_t off;
141
142 vmst = _kvm_malloc(kd, sizeof(*vmst));
143 if (vmst == 0) {
144 _kvm_err(kd, kd->program, "cannot allocate vm");
145 return (-1);
146 }

--- 54 unchanged lines hidden (view full) ---

201
202static int
203_kvm_minidump_vatop_v1(kvm_t *kd, u_long va, off_t *pa)
204{
205 struct vmstate *vm;
206 u_long offset;
207 pt_entry_t pte;
208 u_long pteindex;
210 int i;
211 u_long a;
212 off_t ofs;
213
214 vm = kd->vmst;
215 offset = va & (PAGE_SIZE - 1);
216
217 if (va >= vm->hdr.kernbase) {
218 pteindex = (va - vm->hdr.kernbase) >> PAGE_SHIFT;

--- 34 unchanged lines hidden (view full) ---

253{
254 pt_entry_t pt[NPTEPG];
255 struct vmstate *vm;
256 u_long offset;
257 pd_entry_t pde;
258 pd_entry_t pte;
259 u_long pteindex;
260 u_long pdeindex;
209 u_long a;
210 off_t ofs;
211
212 vm = kd->vmst;
213 offset = va & (PAGE_SIZE - 1);
214
215 if (va >= vm->hdr.kernbase) {
216 pteindex = (va - vm->hdr.kernbase) >> PAGE_SHIFT;

--- 34 unchanged lines hidden (view full) ---

251{
252 pt_entry_t pt[NPTEPG];
253 struct vmstate *vm;
254 u_long offset;
255 pd_entry_t pde;
256 pd_entry_t pte;
257 u_long pteindex;
258 u_long pdeindex;
261 int i;
262 u_long a;
263 off_t ofs;
264
265 vm = kd->vmst;
266 offset = va & PAGE_MASK;
267
268 if (va >= vm->hdr.kernbase) {
269 pdeindex = (va - vm->hdr.kernbase) >> PDRSHIFT;

--- 66 unchanged lines hidden ---
259 u_long a;
260 off_t ofs;
261
262 vm = kd->vmst;
263 offset = va & PAGE_MASK;
264
265 if (va >= vm->hdr.kernbase) {
266 pdeindex = (va - vm->hdr.kernbase) >> PDRSHIFT;

--- 66 unchanged lines hidden ---