mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-04 12:52:15 +00:00
Code Issues Releases Activity

Fix bug on method local named object related panic and Bankfield

Browse Source 
operation.
This commit is contained in:
Takanori Watanabe 2002-03-02 15:05:26 +00:00
parent 900ae1c4ab
commit 420ba21437
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=91568
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.sbin/acpi/acpidump/asl_dump.c
View File

@ -202,6 +202,12 @@ print_indent(int indent)
asl_env.curname = old_name; \ asl_env.curname = old_name; \
} while(0) } while(0)
#define ASL_CREATE_LOCALNAMEOBJ(dp) do { \
if(scope_within_method){ \
aml_create_name(&asl_env, dp); \
} \
}while(0);
static void static void
asl_dump_defscope(u_int8_t **dpp, int indent) asl_dump_defscope(u_int8_t **dpp, int indent)
{ {
@ -698,6 +704,7 @@ asl_dump_defopregion(u_int8_t **dpp, int indent)
dp = *dpp; dp = *dpp;
printf("OperationRegion("); printf("OperationRegion(");
ASL_CREATE_LOCALNAMEOBJ(dp);
asl_dump_termobj(&dp, indent); /* Name */ asl_dump_termobj(&dp, indent); /* Name */
printf(", %s, ", regions[*dp++]); /* Space */ printf(", %s, ", regions[*dp++]); /* Space */
asl_dump_termobj(&dp, indent); /* Offset */ asl_dump_termobj(&dp, indent); /* Offset */
@ -734,6 +741,7 @@ asl_dump_field(u_int8_t **dpp, u_int32_t offset)
case '_': case '_':
case '.': case '.':
case '/': case '/':
ASL_CREATE_LOCALNAMEOBJ(dp);
name = asl_dump_namestring(&dp); name = asl_dump_namestring(&dp);
width = asl_dump_pkglength(&dp); width = asl_dump_pkglength(&dp);
offset += width; offset += width;
@ -867,7 +875,7 @@ asl_dump_defbankfield(u_int8_t **dpp, int indent)
pkglength = asl_dump_pkglength(&dp); pkglength = asl_dump_pkglength(&dp);
end = start + pkglength; end = start + pkglength;
printf("Field("); printf("BankField(");
asl_dump_termobj(&dp, indent); /* Name1 */ asl_dump_termobj(&dp, indent); /* Name1 */
printf(", "); printf(", ");
asl_dump_termobj(&dp, indent); /* Name2 */ asl_dump_termobj(&dp, indent); /* Name2 */
@ -1161,6 +1169,7 @@ asl_dump_termobj(u_int8_t **dpp, int indent)
break; break;
case 0x06: /* AliasOp */ case 0x06: /* AliasOp */
printf("Alias("); printf("Alias(");
ASL_CREATE_LOCALNAMEOBJ(dp);
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(", "); printf(", ");
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
@ -1168,6 +1177,7 @@ asl_dump_termobj(u_int8_t **dpp, int indent)
break; break;
case 0x08: /* NameOp */ case 0x08: /* NameOp */
printf("Name("); printf("Name(");
ASL_CREATE_LOCALNAMEOBJ(dp);
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(", "); printf(", ");
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
@ -1190,6 +1200,7 @@ asl_dump_termobj(u_int8_t **dpp, int indent)
switch (opcode) { switch (opcode) {
case 0x01: /* MutexOp */ case 0x01: /* MutexOp */
printf("Mutex("); printf("Mutex(");
ASL_CREATE_LOCALNAMEOBJ(dp);
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(", %d)", *dp++); printf(", %d)", *dp++);
break; break;
@ -1213,6 +1224,7 @@ asl_dump_termobj(u_int8_t **dpp, int indent)
printf(", "); printf(", ");
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(", "); printf(", ");
ASL_CREATE_LOCALNAMEOBJ(dp);
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(")"); printf(")");
break; break;
@ -1507,6 +1519,7 @@ asl_dump_termobj(u_int8_t **dpp, int indent)
printf(", "); printf(", ");
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(", "); printf(", ");
ASL_CREATE_LOCALNAMEOBJ(dp);
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(")"); printf(")");
break; break;
@ -1516,6 +1529,7 @@ asl_dump_termobj(u_int8_t **dpp, int indent)
printf(", "); printf(", ");
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(", "); printf(", ");
ASL_CREATE_LOCALNAMEOBJ(dp);
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(")"); printf(")");
break; break;
@ -1525,6 +1539,7 @@ asl_dump_termobj(u_int8_t **dpp, int indent)
printf(", "); printf(", ");
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(", "); printf(", ");
ASL_CREATE_LOCALNAMEOBJ(dp);
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(")"); printf(")");
break; break;
@ -1534,6 +1549,7 @@ asl_dump_termobj(u_int8_t **dpp, int indent)
printf(", "); printf(", ");
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(", "); printf(", ");
ASL_CREATE_LOCALNAMEOBJ(dp);
asl_dump_termobj(&dp, indent); asl_dump_termobj(&dp, indent);
printf(")"); printf(")");
break; break;