| dt_decl.c (256281) | dt_decl.c (268578) |
|---|---|
| 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, Version 1.0 only 6 * (the "License"). You may not use this file except in compliance 7 * with the License. 8 * --- 7 unchanged lines hidden (view full) --- 16 * If applicable, add the following below this CDDL HEADER, with the 17 * fields enclosed by brackets "[]" replaced with your own identifying 18 * information: Portions Copyright [yyyy] [name of copyright owner] 19 * 20 * CDDL HEADER END 21 */ 22/* 23 * Copyright 2005 Sun Microsystems, Inc. All rights reserved. | 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, Version 1.0 only 6 * (the "License"). You may not use this file except in compliance 7 * with the License. 8 * --- 7 unchanged lines hidden (view full) --- 16 * If applicable, add the following below this CDDL HEADER, with the 17 * fields enclosed by brackets "[]" replaced with your own identifying 18 * information: Portions Copyright [yyyy] [name of copyright owner] 19 * 20 * CDDL HEADER END 21 */ 22/* 23 * Copyright 2005 Sun Microsystems, Inc. All rights reserved. |
| 24 * Copyright (c) 2012 by Delphix. All rights reserved. | 24 * Copyright (c) 2013 by Delphix. All rights reserved. 25 * Copyright (c) 2013 Joyent, Inc. All rights reserved. |
| 25 * Use is subject to license terms. 26 */ 27 28#pragma ident "%Z%%M% %I% %E% SMI" 29 30#include <strings.h> 31#include <stdlib.h> 32#include <limits.h> --- 741 unchanged lines hidden (view full) --- 774 if (idp == NULL) 775 longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM); 776 777 yyintprefix = 0; 778 yyintsuffix[0] = '\0'; 779 yyintdecimal = 0; 780 781 dnp = dt_node_int(value); | 26 * Use is subject to license terms. 27 */ 28 29#pragma ident "%Z%%M% %I% %E% SMI" 30 31#include <strings.h> 32#include <stdlib.h> 33#include <limits.h> --- 741 unchanged lines hidden (view full) --- 775 if (idp == NULL) 776 longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM); 777 778 yyintprefix = 0; 779 yyintsuffix[0] = '\0'; 780 yyintdecimal = 0; 781 782 dnp = dt_node_int(value); |
| 782 dt_node_type_assign(dnp, dsp->ds_ctfp, dsp->ds_type); | 783 dt_node_type_assign(dnp, dsp->ds_ctfp, dsp->ds_type, B_FALSE); |
| 783 784 if ((inp = malloc(sizeof (dt_idnode_t))) == NULL) 785 longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM); 786 787 /* 788 * Remove the INT node from the node allocation list and store it in 789 * din_list and din_root so it persists with and is freed by the ident. 790 */ --- 25 unchanged lines hidden (view full) --- 816 ctf_arinfo_t r; 817 ctf_id_t type; 818 819 char n[DT_TYPE_NAMELEN]; 820 uint_t flag; 821 char *name; 822 int rv; 823 | 784 785 if ((inp = malloc(sizeof (dt_idnode_t))) == NULL) 786 longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM); 787 788 /* 789 * Remove the INT node from the node allocation list and store it in 790 * din_list and din_root so it persists with and is freed by the ident. 791 */ --- 25 unchanged lines hidden (view full) --- 817 ctf_arinfo_t r; 818 ctf_id_t type; 819 820 char n[DT_TYPE_NAMELEN]; 821 uint_t flag; 822 char *name; 823 int rv; 824 |
| 825 tip->dtt_flags = 0; 826 |
|
| 824 /* 825 * Based on our current #include depth and decl stack depth, determine 826 * which dynamic CTF module and scope to use when adding any new types. 827 */ 828 dmp = yypcb->pcb_idepth ? dtp->dt_cdefs : dtp->dt_ddefs; 829 flag = yypcb->pcb_dstack.ds_next ? CTF_ADD_NONROOT : CTF_ADD_ROOT; 830 | 827 /* 828 * Based on our current #include depth and decl stack depth, determine 829 * which dynamic CTF module and scope to use when adding any new types. 830 */ 831 dmp = yypcb->pcb_idepth ? dtp->dt_cdefs : dtp->dt_ddefs; 832 flag = yypcb->pcb_dstack.ds_next ? CTF_ADD_NONROOT : CTF_ADD_ROOT; 833 |
| 834 if (ddp->dd_attr & DT_DA_USER) 835 tip->dtt_flags = DTT_FL_USER; 836 |
|
| 831 /* 832 * If we have already cached a CTF type for this decl, then we just 833 * return the type information for the cached type. 834 */ 835 if (ddp->dd_ctfp != NULL && 836 (dmp = dt_module_lookup_by_ctf(dtp, ddp->dd_ctfp)) != NULL) { 837 tip->dtt_object = dmp->dm_name; 838 tip->dtt_ctfp = ddp->dd_ctfp; --- 285 unchanged lines hidden --- | 837 /* 838 * If we have already cached a CTF type for this decl, then we just 839 * return the type information for the cached type. 840 */ 841 if (ddp->dd_ctfp != NULL && 842 (dmp = dt_module_lookup_by_ctf(dtp, ddp->dd_ctfp)) != NULL) { 843 tip->dtt_object = dmp->dm_name; 844 tip->dtt_ctfp = ddp->dd_ctfp; --- 285 unchanged lines hidden --- |