| dt_isadep.c (228548) | dt_isadep.c (249367) |
|---|---|
| 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 10 unchanged lines hidden (view full) --- 19 * CDDL HEADER END 20 */ 21 22/* 23 * Copyright 2009 Sun Microsystems, Inc. All rights reserved. 24 * Use is subject to license terms. 25 */ 26 | 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 10 unchanged lines hidden (view full) --- 19 * CDDL HEADER END 20 */ 21 22/* 23 * Copyright 2009 Sun Microsystems, Inc. All rights reserved. 24 * Use is subject to license terms. 25 */ 26 |
| 27/* 28 * Copyright (c) 2012 by Delphix. All rights reserved. 29 */ 30 |
|
| 27#include <stdlib.h> 28#include <assert.h> 29#include <errno.h> 30#include <string.h> 31#include <libgen.h> 32 33#include <dt_impl.h> 34#include <dt_pid.h> --- 485 unchanged lines hidden (view full) --- 520 if (dtrace_disx86(&x86dis, cpu_mode) != 0) 521 return (-1); 522 523 /* 524 * If the instruction was a single-byte breakpoint, there may be 525 * another debugger attached to this process. The original instruction 526 * can't be recovered so this must fail. 527 */ | 31#include <stdlib.h> 32#include <assert.h> 33#include <errno.h> 34#include <string.h> 35#include <libgen.h> 36 37#include <dt_impl.h> 38#include <dt_pid.h> --- 485 unchanged lines hidden (view full) --- 524 if (dtrace_disx86(&x86dis, cpu_mode) != 0) 525 return (-1); 526 527 /* 528 * If the instruction was a single-byte breakpoint, there may be 529 * another debugger attached to this process. The original instruction 530 * can't be recovered so this must fail. 531 */ |
| 528 if (x86dis.d86_len == 1 && instr[0] == FASTTRAP_INSTR) | 532 if (x86dis.d86_len == 1 && 533 (uchar_t)x86dis.d86_bytes[0] == FASTTRAP_INSTR) |
| 529 return (-1); 530 531 return (x86dis.d86_len); 532} | 534 return (-1); 535 536 return (x86dis.d86_len); 537} |