Remove llvm-upgrade and update test cases.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47793 91177308-0d34-0410-b5e6-96231b3b80d8

5 files changed, 478 insertions, 457 deletions

diff --git a/test/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll b/test/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll
index e029831..fa08379 100644
--- a/test/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll
+++ b/test/Transforms/CondProp/2006-08-14-SingleEntryPhiCrash.ll
@@ -1,20 +1,16 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -condprop -disable-output
+; RUN: llvm-as < %s | opt -condprop -disable-output
 ; PR877
-
-target endian = big
-target pointersize = 32
+target datalayout = "E-p:32:32"
 target triple = "powerpc-apple-darwin9.0.0d1"
-	"struct.kc::impl_Ccode_option" = type { "struct.kc::impl_abstract_phylum" }
-	"struct.kc::impl_ID" = type { "struct.kc::impl_abstract_phylum", "struct.kc::impl_Ccode_option"*, "struct.kc::impl_casestring__Str"*, int, "struct.kc::impl_casestring__Str"* }
-	"struct.kc::impl_abstract_phylum" = type { int (...)** }
-	"struct.kc::impl_casestring__Str" = type { "struct.kc::impl_abstract_phylum", sbyte* }
-	"struct.kc::impl_elem_patternrepresentation" = type { "struct.kc::impl_abstract_phylum", int, "struct.kc::impl_casestring__Str"*, "struct.kc::impl_ID"* }
-	"struct.kc::impl_outmostpatterns" = type { "struct.kc::impl_Ccode_option", "struct.kc::impl_elem_patternrepresentation"*, "struct.kc::impl_outmostpatterns"* }
-	"struct.kc::impl_patternrepresentations" = type { "struct.kc::impl_Ccode_option", "struct.kc::impl_outmostpatterns"*, "struct.kc::impl_patternrepresentations"* }
-
-implementation   ; Functions:
-
-void %_ZN2kc16compare_patternsEPNS_26impl_patternrepresentationES1_PNS_27impl_patternrepresentationsE() {
+	%"struct.kc::impl_Ccode_option" = type { %"struct.kc::impl_abstract_phylum" }
+	%"struct.kc::impl_ID" = type { %"struct.kc::impl_abstract_phylum", %"struct.kc::impl_Ccode_option"*, %"struct.kc::impl_casestring__Str"*, i32, %"struct.kc::impl_casestring__Str"* }
+	%"struct.kc::impl_abstract_phylum" = type { i32 (...)** }
+	%"struct.kc::impl_casestring__Str" = type { %"struct.kc::impl_abstract_phylum", i8* }
+	%"struct.kc::impl_elem_patternrepresentation" = type { %"struct.kc::impl_abstract_phylum", i32, %"struct.kc::impl_casestring__Str"*, %"struct.kc::impl_ID"* }
+	%"struct.kc::impl_outmostpatterns" = type { %"struct.kc::impl_Ccode_option", %"struct.kc::impl_elem_patternrepresentation"*, %"struct.kc::impl_outmostpatterns"* }
+	%"struct.kc::impl_patternrepresentations" = type { %"struct.kc::impl_Ccode_option", %"struct.kc::impl_outmostpatterns"*, %"struct.kc::impl_patternrepresentations"* }
+
+define void @_ZN2kc16compare_patternsEPNS_26impl_patternrepresentationES1_PNS_27impl_patternrepresentationsE() {
 entry:
 	br label %bb1269.outer.outer.outer.outer
 
@@ -22,55 +18,55 @@ cond_true:		; preds = %cond_true1298
 	br label %bb1269.outer69
 
 cond_false:		; preds = %cond_true1298
-	br bool false, label %cond_next, label %bb51
+	br i1 false, label %cond_next, label %bb51
 
 cond_next:		; preds = %cond_false
-	br bool false, label %bb52, label %bb51
+	br i1 false, label %bb52, label %bb51
 
 bb51:		; preds = %cond_next, %cond_false
 	br label %bb52
 
 bb52:		; preds = %bb51, %cond_next
-	br bool false, label %cond_false82, label %cond_true55
+	br i1 false, label %cond_false82, label %cond_true55
 
 cond_true55:		; preds = %bb52
-	br bool false, label %UnifiedReturnBlock, label %cond_true57
+	br i1 false, label %UnifiedReturnBlock, label %cond_true57
 
 cond_true57:		; preds = %cond_true55
 	br label %UnifiedReturnBlock
 
 cond_false82:		; preds = %bb52
-	br bool false, label %cond_next97, label %bb113
+	br i1 false, label %cond_next97, label %bb113
 
 cond_next97:		; preds = %cond_false82
-	br bool false, label %bb114, label %bb113
+	br i1 false, label %bb114, label %bb113
 
 bb113:		; preds = %cond_next97, %cond_false82
 	br label %bb114
 
 bb114:		; preds = %bb113, %cond_next97
-	br bool false, label %cond_false151, label %cond_true117
+	br i1 false, label %cond_false151, label %cond_true117
 
 cond_true117:		; preds = %bb114
-	br bool false, label %UnifiedReturnBlock, label %cond_true120
+	br i1 false, label %UnifiedReturnBlock, label %cond_true120
 
 cond_true120:		; preds = %cond_true117
 	br label %UnifiedReturnBlock
 
 cond_false151:		; preds = %bb114
-	br bool false, label %cond_next166, label %bb182
+	br i1 false, label %cond_next166, label %bb182
 
 cond_next166:		; preds = %cond_false151
-	br bool false, label %bb183, label %bb182
+	br i1 false, label %bb183, label %bb182
 
 bb182:		; preds = %cond_next166, %cond_false151
 	br label %bb183
 
 bb183:		; preds = %bb182, %cond_next166
-	br bool false, label %cond_false256, label %cond_true186
+	br i1 false, label %cond_false256, label %cond_true186
 
 cond_true186:		; preds = %bb183
-	br bool false, label %cond_true207, label %cond_false214
+	br i1 false, label %cond_true207, label %cond_false214
 
 cond_true207:		; preds = %cond_true186
 	br label %bb1269.outer38.backedge
@@ -79,7 +75,7 @@ bb1269.outer38.backedge:		; preds = %cond_true545, %cond_true432, %cond_true320,
 	br label %bb1269.outer38
 
 cond_false214:		; preds = %cond_true186
-	br bool false, label %cond_true228, label %cond_false235
+	br i1 false, label %cond_true228, label %cond_false235
 
 cond_true228:		; preds = %cond_false214
 	br label %bb1269.outer21.backedge
@@ -88,115 +84,115 @@ bb1269.outer21.backedge:		; preds = %cond_true566, %cond_true453, %cond_true341,
 	br label %bb1269.outer21
 
 cond_false235:		; preds = %cond_false214
-	br bool false, label %UnifiedReturnBlock, label %cond_false250
+	br i1 false, label %UnifiedReturnBlock, label %cond_false250
 
 cond_false250:		; preds = %cond_false235
 	br label %UnifiedUnreachableBlock
 
 cond_false256:		; preds = %bb183
-	br bool false, label %cond_next271, label %bb287
+	br i1 false, label %cond_next271, label %bb287
 
 cond_next271:		; preds = %cond_false256
-	br bool false, label %bb288, label %bb287
+	br i1 false, label %bb288, label %bb287
 
 bb287:		; preds = %cond_next271, %cond_false256
 	br label %bb288
 
 bb288:		; preds = %bb287, %cond_next271
-	br bool false, label %cond_false369, label %cond_true291
+	br i1 false, label %cond_false369, label %cond_true291
 
 cond_true291:		; preds = %bb288
-	br bool false, label %cond_true320, label %cond_false327
+	br i1 false, label %cond_true320, label %cond_false327
 
 cond_true320:		; preds = %cond_true291
 	br label %bb1269.outer38.backedge
 
 cond_false327:		; preds = %cond_true291
-	br bool false, label %cond_true341, label %cond_false348
+	br i1 false, label %cond_true341, label %cond_false348
 
 cond_true341:		; preds = %cond_false327
 	br label %bb1269.outer21.backedge
 
 cond_false348:		; preds = %cond_false327
-	br bool false, label %UnifiedReturnBlock, label %cond_false363
+	br i1 false, label %UnifiedReturnBlock, label %cond_false363
 
 cond_false363:		; preds = %cond_false348
 	br label %UnifiedUnreachableBlock
 
 cond_false369:		; preds = %bb288
-	br bool false, label %cond_next384, label %bb400
+	br i1 false, label %cond_next384, label %bb400
 
 cond_next384:		; preds = %cond_false369
-	br bool false, label %bb401, label %bb400
+	br i1 false, label %bb401, label %bb400
 
 bb400:		; preds = %cond_next384, %cond_false369
 	br label %bb401
 
 bb401:		; preds = %bb400, %cond_next384
-	br bool false, label %cond_false481, label %cond_true404
+	br i1 false, label %cond_false481, label %cond_true404
 
 cond_true404:		; preds = %bb401
-	br bool false, label %cond_true432, label %cond_false439
+	br i1 false, label %cond_true432, label %cond_false439
 
 cond_true432:		; preds = %cond_true404
 	br label %bb1269.outer38.backedge
 
 cond_false439:		; preds = %cond_true404
-	br bool false, label %cond_true453, label %cond_false460
+	br i1 false, label %cond_true453, label %cond_false460
 
 cond_true453:		; preds = %cond_false439
 	br label %bb1269.outer21.backedge
 
 cond_false460:		; preds = %cond_false439
-	br bool false, label %UnifiedReturnBlock, label %cond_false475
+	br i1 false, label %UnifiedReturnBlock, label %cond_false475
 
 cond_false475:		; preds = %cond_false460
 	br label %UnifiedUnreachableBlock
 
 cond_false481:		; preds = %bb401
-	br bool false, label %cond_next496, label %bb512
+	br i1 false, label %cond_next496, label %bb512
 
 cond_next496:		; preds = %cond_false481
-	br bool false, label %bb513, label %bb512
+	br i1 false, label %bb513, label %bb512
 
 bb512:		; preds = %cond_next496, %cond_false481
 	br label %bb513
 
 bb513:		; preds = %bb512, %cond_next496
-	br bool false, label %cond_false594, label %cond_true516
+	br i1 false, label %cond_false594, label %cond_true516
 
 cond_true516:		; preds = %bb513
-	br bool false, label %cond_true545, label %cond_false552
+	br i1 false, label %cond_true545, label %cond_false552
 
 cond_true545:		; preds = %cond_true516
 	br label %bb1269.outer38.backedge
 
 cond_false552:		; preds = %cond_true516
-	br bool false, label %cond_true566, label %cond_false573
+	br i1 false, label %cond_true566, label %cond_false573
 
 cond_true566:		; preds = %cond_false552
 	br label %bb1269.outer21.backedge
 
 cond_false573:		; preds = %cond_false552
-	br bool false, label %UnifiedReturnBlock, label %cond_false588
+	br i1 false, label %UnifiedReturnBlock, label %cond_false588
 
 cond_false588:		; preds = %cond_false573
 	br label %UnifiedUnreachableBlock
 
 cond_false594:		; preds = %bb513
-	br bool false, label %cond_next609, label %bb625
+	br i1 false, label %cond_next609, label %bb625
 
 cond_next609:		; preds = %cond_false594
-	br bool false, label %bb626, label %bb625
+	br i1 false, label %bb626, label %bb625
 
 bb625:		; preds = %cond_next609, %cond_false594
 	br label %bb626
 
 bb626:		; preds = %bb625, %cond_next609
-	br bool false, label %cond_false707, label %cond_true629
+	br i1 false, label %cond_false707, label %cond_true629
 
 cond_true629:		; preds = %bb626
-	br bool false, label %cond_true658, label %cond_false665
+	br i1 false, label %cond_true658, label %cond_false665
 
 cond_true658:		; preds = %cond_true629
 	br label %bb1269.outer2.backedge
@@ -205,31 +201,31 @@ bb1269.outer2.backedge:		; preds = %cond_true679, %cond_true658
 	br label %bb1269.outer2
 
 cond_false665:		; preds = %cond_true629
-	br bool false, label %cond_true679, label %cond_false686
+	br i1 false, label %cond_true679, label %cond_false686
 
 cond_true679:		; preds = %cond_false665
 	br label %bb1269.outer2.backedge
 
 cond_false686:		; preds = %cond_false665
-	br bool false, label %UnifiedReturnBlock, label %cond_false701
+	br i1 false, label %UnifiedReturnBlock, label %cond_false701
 
 cond_false701:		; preds = %cond_false686
 	br label %UnifiedUnreachableBlock
 
 cond_false707:		; preds = %bb626
-	br bool false, label %cond_next722, label %bb738
+	br i1 false, label %cond_next722, label %bb738
 
 cond_next722:		; preds = %cond_false707
-	br bool false, label %bb739, label %bb738
+	br i1 false, label %bb739, label %bb738
 
 bb738:		; preds = %cond_next722, %cond_false707
 	br label %bb739
 
 bb739:		; preds = %bb738, %cond_next722
-	br bool false, label %cond_false820, label %cond_true742
+	br i1 false, label %cond_false820, label %cond_true742
 
 cond_true742:		; preds = %bb739
-	br bool false, label %cond_true771, label %cond_false778
+	br i1 false, label %cond_true771, label %cond_false778
 
 cond_true771:		; preds = %cond_true742
 	br label %bb1269.outer.backedge
@@ -238,31 +234,31 @@ bb1269.outer.backedge:		; preds = %cond_true792, %cond_true771
 	br label %bb1269.outer
 
 cond_false778:		; preds = %cond_true742
-	br bool false, label %cond_true792, label %cond_false799
+	br i1 false, label %cond_true792, label %cond_false799
 
 cond_true792:		; preds = %cond_false778
 	br label %bb1269.outer.backedge
 
 cond_false799:		; preds = %cond_false778
-	br bool false, label %UnifiedReturnBlock, label %cond_false814
+	br i1 false, label %UnifiedReturnBlock, label %cond_false814
 
 cond_false814:		; preds = %cond_false799
 	br label %UnifiedUnreachableBlock
 
 cond_false820:		; preds = %bb739
-	br bool false, label %cond_next835, label %bb851
+	br i1 false, label %cond_next835, label %bb851
 
 cond_next835:		; preds = %cond_false820
-	br bool false, label %bb852, label %bb851
+	br i1 false, label %bb852, label %bb851
 
 bb851:		; preds = %cond_next835, %cond_false820
 	br label %bb852
 
 bb852:		; preds = %bb851, %cond_next835
-	br bool false, label %cond_false933, label %cond_true855
+	br i1 false, label %cond_false933, label %cond_true855
 
 cond_true855:		; preds = %bb852
-	br bool false, label %cond_true884, label %cond_false891
+	br i1 false, label %cond_true884, label %cond_false891
 
 cond_true884:		; preds = %cond_true855
 	br label %bb1269.outer.outer.backedge
@@ -271,31 +267,31 @@ bb1269.outer.outer.backedge:		; preds = %cond_true905, %cond_true884
 	br label %bb1269.outer.outer
 
 cond_false891:		; preds = %cond_true855
-	br bool false, label %cond_true905, label %cond_false912
+	br i1 false, label %cond_true905, label %cond_false912
 
 cond_true905:		; preds = %cond_false891
 	br label %bb1269.outer.outer.backedge
 
 cond_false912:		; preds = %cond_false891
-	br bool false, label %UnifiedReturnBlock, label %cond_false927
+	br i1 false, label %UnifiedReturnBlock, label %cond_false927
 
 cond_false927:		; preds = %cond_false912
 	br label %UnifiedUnreachableBlock
 
 cond_false933:		; preds = %bb852
-	br bool false, label %cond_next948, label %bb964
+	br i1 false, label %cond_next948, label %bb964
 
 cond_next948:		; preds = %cond_false933
-	br bool false, label %bb965, label %bb964
+	br i1 false, label %bb965, label %bb964
 
 bb964:		; preds = %cond_next948, %cond_false933
 	br label %bb965
 
 bb965:		; preds = %bb964, %cond_next948
-	br bool false, label %cond_false1046, label %cond_true968
+	br i1 false, label %cond_false1046, label %cond_true968
 
 cond_true968:		; preds = %bb965
-	br bool false, label %cond_true997, label %cond_false1004
+	br i1 false, label %cond_true997, label %cond_false1004
 
 cond_true997:		; preds = %cond_true968
 	br label %bb1269.outer.outer.outer.backedge
@@ -304,32 +300,32 @@ bb1269.outer.outer.outer.backedge:		; preds = %cond_true1018, %cond_true997
 	br label %bb1269.outer.outer.outer
 
 cond_false1004:		; preds = %cond_true968
-	br bool false, label %cond_true1018, label %cond_false1025
+	br i1 false, label %cond_true1018, label %cond_false1025
 
 cond_true1018:		; preds = %cond_false1004
 	br label %bb1269.outer.outer.outer.backedge
 
 cond_false1025:		; preds = %cond_false1004
-	br bool false, label %UnifiedReturnBlock, label %cond_false1040
+	br i1 false, label %UnifiedReturnBlock, label %cond_false1040
 
 cond_false1040:		; preds = %cond_false1025
 	br label %UnifiedUnreachableBlock
 
 cond_false1046:		; preds = %bb965
-	br bool false, label %cond_next1061, label %bb1077
+	br i1 false, label %cond_next1061, label %bb1077
 
 cond_next1061:		; preds = %cond_false1046
-	br bool false, label %bb1078, label %bb1077
+	br i1 false, label %bb1078, label %bb1077
 
 bb1077:		; preds = %cond_next1061, %cond_false1046
 	br label %bb1078
 
 bb1078:		; preds = %bb1077, %cond_next1061
-	%tmp1080 = phi bool [ true, %bb1077 ], [ false, %cond_next1061 ]		; <bool> [#uses=1]
-	br bool %tmp1080, label %cond_false1159, label %cond_true1081
+	%tmp1080 = phi i1 [ true, %bb1077 ], [ false, %cond_next1061 ]		; <i1> [#uses=1]
+	br i1 %tmp1080, label %cond_false1159, label %cond_true1081
 
 cond_true1081:		; preds = %bb1078
-	br bool false, label %cond_true1110, label %cond_false1117
+	br i1 false, label %cond_true1110, label %cond_false1117
 
 cond_true1110:		; preds = %cond_true1081
 	br label %bb1269.outer.outer.outer.outer.backedge
@@ -338,32 +334,32 @@ bb1269.outer.outer.outer.outer.backedge:		; preds = %cond_true1131, %cond_true11
 	br label %bb1269.outer.outer.outer.outer
 
 cond_false1117:		; preds = %cond_true1081
-	br bool false, label %cond_true1131, label %cond_false1138
+	br i1 false, label %cond_true1131, label %cond_false1138
 
 cond_true1131:		; preds = %cond_false1117
 	br label %bb1269.outer.outer.outer.outer.backedge
 
 cond_false1138:		; preds = %cond_false1117
-	br bool false, label %UnifiedReturnBlock, label %cond_false1153
+	br i1 false, label %UnifiedReturnBlock, label %cond_false1153
 
 cond_false1153:		; preds = %cond_false1138
 	br label %UnifiedUnreachableBlock
 
 cond_false1159:		; preds = %bb1078
-	%tmp.i119.lcssa35.lcssa.lcssa.lcssa.lcssa.lcssa = phi "struct.kc::impl_elem_patternrepresentation"* [ null, %bb1078 ]		; <"struct.kc::impl_elem_patternrepresentation"*> [#uses=0]
-	br bool false, label %UnifiedReturnBlock, label %cond_false1174
+	%tmp.i119.lcssa35.lcssa.lcssa.lcssa.lcssa.lcssa = phi %"struct.kc::impl_elem_patternrepresentation"* [ null, %bb1078 ]		; <%"struct.kc::impl_elem_patternrepresentation"*> [#uses=0]
+	br i1 false, label %UnifiedReturnBlock, label %cond_false1174
 
 cond_false1174:		; preds = %cond_false1159
-	br bool false, label %UnifiedReturnBlock, label %cond_false1189
+	br i1 false, label %UnifiedReturnBlock, label %cond_false1189
 
 cond_false1189:		; preds = %cond_false1174
-	br bool false, label %UnifiedReturnBlock, label %cond_false1204
+	br i1 false, label %UnifiedReturnBlock, label %cond_false1204
 
 cond_false1204:		; preds = %cond_false1189
-	br bool false, label %UnifiedReturnBlock, label %cond_false1219
+	br i1 false, label %UnifiedReturnBlock, label %cond_false1219
 
 cond_false1219:		; preds = %cond_false1204
-	br bool false, label %UnifiedReturnBlock, label %cond_true1222
+	br i1 false, label %UnifiedReturnBlock, label %cond_true1222
 
 cond_true1222:		; preds = %cond_false1219
 	br label %UnifiedReturnBlock
@@ -396,22 +392,22 @@ bb1269.outer69:		; preds = %bb1269.outer54, %cond_true
 	br label %bb1269
 
 bb1269:		; preds = %bb1269.outer69
-	br bool false, label %cond_next1281, label %bb1294
+	br i1 false, label %cond_next1281, label %bb1294
 
 cond_next1281:		; preds = %bb1269
-	br bool false, label %cond_true1298, label %bb1294
+	br i1 false, label %cond_true1298, label %bb1294
 
 bb1294:		; preds = %cond_next1281, %bb1269
-	br bool false, label %cond_true1331, label %cond_next1313
+	br i1 false, label %cond_true1331, label %cond_next1313
 
 cond_true1298:		; preds = %cond_next1281
-	br bool false, label %cond_false, label %cond_true
+	br i1 false, label %cond_false, label %cond_true
 
 cond_next1313:		; preds = %bb1294
-	br bool false, label %cond_true1331, label %cond_next1355
+	br i1 false, label %cond_true1331, label %cond_next1355
 
 cond_true1331:		; preds = %cond_next1313, %bb1294
-	br bool false, label %cond_false1346, label %cond_true1342
+	br i1 false, label %cond_false1346, label %cond_true1342
 
 cond_true1342:		; preds = %cond_true1331
 	br label %cond_next1350
@@ -423,37 +419,37 @@ cond_next1350:		; preds = %cond_false1346, %cond_true1342
 	br label %bb.i
 
 bb.i:		; preds = %bb.i, %cond_next1350
-	br bool false, label %_ZN2kc18impl_abstract_list8freelistEv.exit, label %bb.i
+	br i1 false, label %_ZN2kc18impl_abstract_list8freelistEv.exit, label %bb.i
 
 _ZN2kc18impl_abstract_list8freelistEv.exit:		; preds = %bb.i
 	br label %cond_next1355
 
 cond_next1355:		; preds = %_ZN2kc18impl_abstract_list8freelistEv.exit, %cond_next1313
-	br bool false, label %cond_next1363, label %bb1388
+	br i1 false, label %cond_next1363, label %bb1388
 
 cond_next1363:		; preds = %cond_next1355
-	br bool false, label %UnifiedReturnBlock, label %cond_true1366
+	br i1 false, label %UnifiedReturnBlock, label %cond_true1366
 
 cond_true1366:		; preds = %cond_next1363
 	br label %UnifiedReturnBlock
 
 bb1388:		; preds = %cond_next1355
-	br bool false, label %UnifiedReturnBlock, label %bb1414.preheader
+	br i1 false, label %UnifiedReturnBlock, label %bb1414.preheader
 
 bb1414.preheader:		; preds = %bb1388
 	br label %bb1414
 
 bb1414:		; preds = %cond_true1426, %bb1414.preheader
-	br bool false, label %cond_true1426, label %bb1429
+	br i1 false, label %cond_true1426, label %bb1429
 
 cond_true1426:		; preds = %bb1414
 	br label %bb1414
 
 bb1429:		; preds = %bb1414
-	br bool false, label %cond_true1431, label %UnifiedReturnBlock
+	br i1 false, label %cond_true1431, label %UnifiedReturnBlock
 
 cond_true1431:		; preds = %bb1429
-	br bool false, label %UnifiedReturnBlock, label %cond_true1434
+	br i1 false, label %UnifiedReturnBlock, label %cond_true1434
 
 cond_true1434:		; preds = %cond_true1431
 	br label %UnifiedReturnBlock
diff --git a/test/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll b/test/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll
index 5221319..573ee6c 100644
--- a/test/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll
+++ b/test/Transforms/CondProp/2006-11-01-PhiNodeCrash.ll
@@ -1,224 +1,221 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -condprop -disable-output
+; RUN: llvm-as < %s | opt -condprop -disable-output
 ; PR979
+
 target datalayout = "e-p:32:32"
-target endian = little
-target pointersize = 32
 target triple = "i686-pc-linux-gnu"
 deplibs = [ "c", "crtend" ]
-	%struct.IO_APIC_reg_00 = type { uint }
-	%struct.Qdisc = type { int (%struct.sk_buff*, %struct.Qdisc*)*, %struct.sk_buff* (%struct.Qdisc*)*, uint, %struct.Qdisc_ops*, %struct.Qdisc*, uint, %struct.bluez_skb_cb, %struct.sk_buff_head, %struct.net_device*, %struct.tc_stats, int (%struct.sk_buff*, %struct.Qdisc*)*, %struct.Qdisc*, [1 x sbyte] }
-	%struct.Qdisc_class_ops = type { int (%struct.Qdisc*, uint, %struct.Qdisc*, %struct.Qdisc**)*, %struct.Qdisc* (%struct.Qdisc*, uint)*, uint (%struct.Qdisc*, uint)*, void (%struct.Qdisc*, uint)*, int (%struct.Qdisc*, uint, uint, %struct._agp_version**, uint*)*, int (%struct.Qdisc*, uint)*, void (%struct.Qdisc*, %struct.qdisc_walker*)*, %struct.tcf_proto** (%struct.Qdisc*, uint)*, uint (%struct.Qdisc*, uint, uint)*, void (%struct.Qdisc*, uint)*, int (%struct.Qdisc*, uint, %struct.sk_buff*, %struct.tcmsg*)* }
-	%struct.Qdisc_ops = type { %struct.Qdisc_ops*, %struct.Qdisc_class_ops*, [16 x sbyte], int, int (%struct.sk_buff*, %struct.Qdisc*)*, %struct.sk_buff* (%struct.Qdisc*)*, int (%struct.sk_buff*, %struct.Qdisc*)*, uint (%struct.Qdisc*)*, int (%struct.Qdisc*, %struct._agp_version*)*, void (%struct.Qdisc*)*, void (%struct.Qdisc*)*, int (%struct.Qdisc*, %struct._agp_version*)*, int (%struct.Qdisc*, %struct.sk_buff*)* }
-	%struct.ViceFid = type { uint, uint, uint }
-	%struct.__wait_queue = type { uint, %struct.task_struct*, %struct.list_head }
+	%struct.IO_APIC_reg_00 = type { i32 }
+	%struct.Qdisc = type { i32 (%struct.sk_buff*, %struct.Qdisc*)*, %struct.sk_buff* (%struct.Qdisc*)*, i32, %struct.Qdisc_ops*, %struct.Qdisc*, i32, %struct.IO_APIC_reg_00, %struct.sk_buff_head, %struct.net_device*, %struct.tc_stats, i32 (%struct.sk_buff*, %struct.Qdisc*)*, %struct.Qdisc*, [1 x i8] }
+	%struct.Qdisc_class_ops = type { i32 (%struct.Qdisc*, i32, %struct.Qdisc*, %struct.Qdisc**)*, %struct.Qdisc* (%struct.Qdisc*, i32)*, i32 (%struct.Qdisc*, i32)*, void (%struct.Qdisc*, i32)*, i32 (%struct.Qdisc*, i32, i32, %struct._agp_version**, i32*)*, i32 (%struct.Qdisc*, i32)*, void (%struct.Qdisc*, %struct.qdisc_walker*)*, %struct.tcf_proto** (%struct.Qdisc*, i32)*, i32 (%struct.Qdisc*, i32, i32)*, void (%struct.Qdisc*, i32)*, i32 (%struct.Qdisc*, i32, %struct.sk_buff*, %struct.tcmsg*)* }
+	%struct.Qdisc_ops = type { %struct.Qdisc_ops*, %struct.Qdisc_class_ops*, [16 x i8], i32, i32 (%struct.sk_buff*, %struct.Qdisc*)*, %struct.sk_buff* (%struct.Qdisc*)*, i32 (%struct.sk_buff*, %struct.Qdisc*)*, i32 (%struct.Qdisc*)*, i32 (%struct.Qdisc*, %struct._agp_version*)*, void (%struct.Qdisc*)*, void (%struct.Qdisc*)*, i32 (%struct.Qdisc*, %struct._agp_version*)*, i32 (%struct.Qdisc*, %struct.sk_buff*)* }
+	%struct.ViceFid = type { i32, i32, i32 }
+	%struct.__wait_queue = type { i32, %struct.task_struct*, %struct.list_head }
 	%struct.__wait_queue_head = type { %struct.IO_APIC_reg_00, %struct.list_head }
-	%struct._agp_version = type { ushort, ushort }
-	%struct._drm_i810_overlay_t = type { uint, uint }
-	%struct.address_space = type { %struct.list_head, %struct.list_head, %struct.list_head, uint, %struct.address_space_operations*, %struct.inode*, %struct.vm_area_struct*, %struct.vm_area_struct*, %struct.IO_APIC_reg_00, int }
-	%struct.address_space_operations = type { int (%struct.page*)*, int (%struct.file*, %struct.page*)*, int (%struct.page*)*, int (%struct.file*, %struct.page*, uint, uint)*, int (%struct.file*, %struct.page*, uint, uint)*, int (%struct.address_space*, int)*, int (%struct.page*, uint)*, int (%struct.page*, int)*, int (int, %struct.inode*, %struct.kiobuf*, uint, int)*, int (int, %struct.file*, %struct.kiobuf*, uint, int)*, void (%struct.page*)* }
-	%struct.audio_buf_info = type { int, int, int, int }
-	%struct.autofs_packet_hdr = type { int, int }
-	%struct.block_device = type { %struct.list_head, %struct.bluez_skb_cb, %struct.inode*, ushort, int, %struct.block_device_operations*, %struct.semaphore, %struct.list_head }
-	%struct.block_device_operations = type { int (%struct.inode*, %struct.file*)*, int (%struct.inode*, %struct.file*)*, int (%struct.inode*, %struct.file*, uint, uint)*, int (ushort)*, int (ushort)*, %struct.module* }
-	%struct.bluez_skb_cb = type { int }
-	%struct.buffer_head = type { %struct.buffer_head*, uint, ushort, ushort, ushort, %struct.bluez_skb_cb, ushort, uint, uint, %struct.buffer_head*, %struct.buffer_head*, %struct.buffer_head*, %struct.buffer_head*, %struct.buffer_head**, sbyte*, %struct.page*, void (%struct.buffer_head*, int)*, sbyte*, uint, %struct.__wait_queue_head, %struct.list_head }
-	%struct.char_device = type { %struct.list_head, %struct.bluez_skb_cb, ushort, %struct.bluez_skb_cb, %struct.semaphore }
-	%struct.completion = type { uint, %struct.__wait_queue_head }
-	%struct.cramfs_info = type { uint, uint, uint, uint }
-	%struct.dentry = type { %struct.bluez_skb_cb, uint, %struct.inode*, %struct.dentry*, %struct.list_head, %struct.list_head, %struct.list_head, %struct.list_head, %struct.list_head, int, %struct.qstr, uint, %struct.dentry_operations*, %struct.super_block*, uint, sbyte*, [16 x ubyte] }
-	%struct.dentry_operations = type { int (%struct.dentry*, int)*, int (%struct.dentry*, %struct.qstr*)*, int (%struct.dentry*, %struct.qstr*, %struct.qstr*)*, int (%struct.dentry*)*, void (%struct.dentry*)*, void (%struct.dentry*, %struct.inode*)* }
-	%struct.dev_mc_list = type { %struct.dev_mc_list*, [8 x ubyte], ubyte, int, int }
-	%struct.dnotify_struct = type { %struct.dnotify_struct*, uint, int, %struct.file*, %struct.files_struct* }
-	%struct.dquot = type { %struct.list_head, %struct.list_head, %struct.list_head, %struct.__wait_queue_head, %struct.__wait_queue_head, int, int, %struct.super_block*, uint, ushort, long, short, short, uint, %struct.mem_dqblk }
-	%struct.dquot_operations = type { void (%struct.inode*, int)*, void (%struct.inode*)*, int (%struct.inode*, ulong, int)*, int (%struct.inode*, uint)*, void (%struct.inode*, ulong)*, void (%struct.inode*, uint)*, int (%struct.inode*, %struct.iattr*)*, int (%struct.dquot*)* }
-	%struct.drm_clip_rect = type { ushort, ushort, ushort, ushort }
-	%struct.drm_ctx_priv_map = type { uint, sbyte* }
-	%struct.drm_mga_indices = type { int, uint, uint, int }
-	%struct.dst_entry = type { %struct.dst_entry*, %struct.bluez_skb_cb, int, %struct.net_device*, int, int, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, int, %struct.neighbour*, %struct.hh_cache*, int (%struct.sk_buff*)*, int (%struct.sk_buff*)*, %struct.dst_ops*, [0 x sbyte] }
-	%struct.dst_ops = type { ushort, ushort, uint, int ()*, %struct.dst_entry* (%struct.dst_entry*, uint)*, %struct.dst_entry* (%struct.dst_entry*, %struct.sk_buff*)*, void (%struct.dst_entry*)*, %struct.dst_entry* (%struct.dst_entry*)*, void (%struct.sk_buff*)*, int, %struct.bluez_skb_cb, %struct.kmem_cache_s* }
-	%struct.e820entry = type { ulong, ulong, uint }
-	%struct.exec_domain = type { sbyte*, void (int, %struct.pt_regs*)*, ubyte, ubyte, uint*, uint*, %struct.map_segment*, %struct.map_segment*, %struct.map_segment*, %struct.map_segment*, %struct.module*, %struct.exec_domain* }
-	%struct.ext2_inode_info = type { [15 x uint], uint, uint, ubyte, ubyte, uint, uint, uint, uint, uint, uint, uint, uint, uint, int }
-	%struct.ext3_inode_info = type { [15 x uint], uint, uint, uint, uint, uint, uint, uint, uint, uint, %struct.list_head, long, %struct.rw_semaphore }
-	%struct.fasync_struct = type { int, int, %struct.fasync_struct*, %struct.file* }
-	%struct.file = type { %struct.list_head, %struct.dentry*, %struct.vfsmount*, %struct.file_operations*, %struct.bluez_skb_cb, uint, ushort, long, uint, uint, uint, uint, uint, %struct.drm_mga_indices, uint, uint, int, uint, sbyte*, %struct.kiobuf*, int }
-	%struct.file_lock = type { %struct.file_lock*, %struct.list_head, %struct.list_head, %struct.files_struct*, uint, %struct.__wait_queue_head, %struct.file*, ubyte, ubyte, long, long, void (%struct.file_lock*)*, void (%struct.file_lock*)*, void (%struct.file_lock*)*, %struct.fasync_struct*, uint, { %struct.nfs_lock_info } }
-	%struct.file_operations = type { %struct.module*, long (%struct.file*, long, int)*, int (%struct.file*, sbyte*, uint, long*)*, int (%struct.file*, sbyte*, uint, long*)*, int (%struct.file*, sbyte*, int (sbyte*, sbyte*, int, long, uint, uint)*)*, uint (%struct.file*, %struct.poll_table_struct*)*, int (%struct.inode*, %struct.file*, uint, uint)*, int (%struct.file*, %struct.vm_area_struct*)*, int (%struct.inode*, %struct.file*)*, int (%struct.file*)*, int (%struct.inode*, %struct.file*)*, int (%struct.file*, %struct.dentry*, int)*, int (int, %struct.file*, int)*, int (%struct.file*, int, %struct.file_lock*)*, int (%struct.file*, %struct.iovec*, uint, long*)*, int (%struct.file*, %struct.iovec*, uint, long*)*, int (%struct.file*, %struct.page*, int, uint, long*, int)*, uint (%struct.file*, uint, uint, uint, uint)* }
-	%struct.file_system_type = type { sbyte*, int, %struct.super_block* (%struct.super_block*, sbyte*, int)*, %struct.module*, %struct.file_system_type*, %struct.list_head }
-	%struct.files_struct = type { %struct.bluez_skb_cb, %typedef.rwlock_t, int, int, int, %struct.file**, %typedef.__kernel_fd_set*, %typedef.__kernel_fd_set*, %typedef.__kernel_fd_set, %typedef.__kernel_fd_set, [32 x %struct.file*] }
-	%struct.fs_disk_quota = type { sbyte, sbyte, ushort, uint, ulong, ulong, ulong, ulong, ulong, ulong, int, int, ushort, ushort, int, ulong, ulong, ulong, int, ushort, short, [8 x sbyte] }
-	%struct.fs_quota_stat = type { sbyte, ushort, sbyte, %struct.e820entry, %struct.e820entry, uint, int, int, int, ushort, ushort }
-	%struct.fs_struct = type { %struct.bluez_skb_cb, %typedef.rwlock_t, int, %struct.dentry*, %struct.dentry*, %struct.dentry*, %struct.vfsmount*, %struct.vfsmount*, %struct.vfsmount* }
-	%struct.hh_cache = type { %struct.hh_cache*, %struct.bluez_skb_cb, ushort, int, int (%struct.sk_buff*)*, %typedef.rwlock_t, [32 x uint] }
-	%struct.i387_fxsave_struct = type { ushort, ushort, ushort, ushort, int, int, int, int, int, int, [32 x int], [32 x int], [56 x int] }
-	%struct.iattr = type { uint, ushort, uint, uint, long, int, int, int, uint }
-	%struct.if_dqblk = type { ulong, ulong, ulong, ulong, ulong, ulong, ulong, ulong, uint }
-	%struct.if_dqinfo = type { ulong, ulong, uint, uint }
-	%struct.ifmap = type { uint, uint, ushort, ubyte, ubyte, ubyte }
-	%struct.ifreq = type { { [16 x sbyte] }, %typedef.dvd_authinfo }
-	%struct.inode = type { %struct.list_head, %struct.list_head, %struct.list_head, %struct.list_head, %struct.list_head, uint, %struct.bluez_skb_cb, ushort, ushort, ushort, uint, uint, ushort, long, int, int, int, uint, uint, uint, uint, ushort, %struct.semaphore, %struct.rw_semaphore, %struct.semaphore, %struct.inode_operations*, %struct.file_operations*, %struct.super_block*, %struct.__wait_queue_head, %struct.file_lock*, %struct.address_space*, %struct.address_space, [2 x %struct.dquot*], %struct.list_head, %struct.pipe_inode_info*, %struct.block_device*, %struct.char_device*, uint, %struct.dnotify_struct*, uint, uint, ubyte, %struct.bluez_skb_cb, uint, uint, { %struct.ext2_inode_info, %struct.ext3_inode_info, %struct.msdos_inode_info, %struct.iso_inode_info, %struct.nfs_inode_info, %struct._drm_i810_overlay_t, %struct.shmem_inode_info, %struct.proc_inode_info, %struct.socket, %struct.usbdev_inode_info, sbyte* } }
-	%struct.inode_operations = type { int (%struct.inode*, %struct.dentry*, int)*, %struct.dentry* (%struct.inode*, %struct.dentry*)*, int (%struct.dentry*, %struct.inode*, %struct.dentry*)*, int (%struct.inode*, %struct.dentry*)*, int (%struct.inode*, %struct.dentry*, sbyte*)*, int (%struct.inode*, %struct.dentry*, int)*, int (%struct.inode*, %struct.dentry*)*, int (%struct.inode*, %struct.dentry*, int, int)*, int (%struct.inode*, %struct.dentry*, %struct.inode*, %struct.dentry*)*, int (%struct.dentry*, sbyte*, int)*, int (%struct.dentry*, %struct.nameidata*)*, void (%struct.inode*)*, int (%struct.inode*, int)*, int (%struct.dentry*)*, int (%struct.dentry*, %struct.iattr*)*, int (%struct.dentry*, %struct.iattr*)*, int (%struct.dentry*, sbyte*, sbyte*, uint, int)*, int (%struct.dentry*, sbyte*, sbyte*, uint)*, int (%struct.dentry*, sbyte*, uint)*, int (%struct.dentry*, sbyte*)* }
-	%struct.iovec = type { sbyte*, uint }
-	%struct.ip_options = type { uint, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, [0 x ubyte] }
-	%struct.isapnp_dma = type { ubyte, ubyte, %struct.isapnp_resources*, %struct.isapnp_dma* }
-	%struct.isapnp_irq = type { ushort, ubyte, ubyte, %struct.isapnp_resources*, %struct.isapnp_irq* }
-	%struct.isapnp_mem = type { uint, uint, uint, uint, ubyte, ubyte, %struct.isapnp_resources*, %struct.isapnp_mem* }
-	%struct.isapnp_mem32 = type { [17 x ubyte], %struct.isapnp_resources*, %struct.isapnp_mem32* }
-	%struct.isapnp_port = type { ushort, ushort, ubyte, ubyte, ubyte, ubyte, %struct.isapnp_resources*, %struct.isapnp_port* }
-	%struct.isapnp_resources = type { ushort, ushort, %struct.isapnp_port*, %struct.isapnp_irq*, %struct.isapnp_dma*, %struct.isapnp_mem*, %struct.isapnp_mem32*, %struct.pci_dev*, %struct.isapnp_resources*, %struct.isapnp_resources* }
-	%struct.iso_inode_info = type { uint, ubyte, [3 x ubyte], uint, int }
+	%struct._agp_version = type { i16, i16 }
+	%struct._drm_i810_overlay_t = type { i32, i32 }
+	%struct.address_space = type { %struct.list_head, %struct.list_head, %struct.list_head, i32, %struct.address_space_operations*, %struct.inode*, %struct.vm_area_struct*, %struct.vm_area_struct*, %struct.IO_APIC_reg_00, i32 }
+	%struct.address_space_operations = type { i32 (%struct.page*)*, i32 (%struct.file*, %struct.page*)*, i32 (%struct.page*)*, i32 (%struct.file*, %struct.page*, i32, i32)*, i32 (%struct.file*, %struct.page*, i32, i32)*, i32 (%struct.address_space*, i32)*, i32 (%struct.page*, i32)*, i32 (%struct.page*, i32)*, i32 (i32, %struct.inode*, %struct.kiobuf*, i32, i32)*, i32 (i32, %struct.file*, %struct.kiobuf*, i32, i32)*, void (%struct.page*)* }
+	%struct.audio_buf_info = type { i32, i32, i32, i32 }
+	%struct.autofs_packet_hdr = type { i32, i32 }
+	%struct.block_device = type { %struct.list_head, %struct.IO_APIC_reg_00, %struct.inode*, i16, i32, %struct.block_device_operations*, %struct.semaphore, %struct.list_head }
+	%struct.block_device_operations = type { i32 (%struct.inode*, %struct.file*)*, i32 (%struct.inode*, %struct.file*)*, i32 (%struct.inode*, %struct.file*, i32, i32)*, i32 (i16)*, i32 (i16)*, %struct.module* }
+	%struct.bluez_skb_cb = type { i32 }
+	%struct.buffer_head = type { %struct.buffer_head*, i32, i16, i16, i16, %struct.IO_APIC_reg_00, i16, i32, i32, %struct.buffer_head*, %struct.buffer_head*, %struct.buffer_head*, %struct.buffer_head*, %struct.buffer_head**, i8*, %struct.page*, void (%struct.buffer_head*, i32)*, i8*, i32, %struct.__wait_queue_head, %struct.list_head }
+	%struct.char_device = type { %struct.list_head, %struct.IO_APIC_reg_00, i16, %struct.IO_APIC_reg_00, %struct.semaphore }
+	%struct.completion = type { i32, %struct.__wait_queue_head }
+	%struct.cramfs_info = type { i32, i32, i32, i32 }
+	%struct.dentry = type { %struct.IO_APIC_reg_00, i32, %struct.inode*, %struct.dentry*, %struct.list_head, %struct.list_head, %struct.list_head, %struct.list_head, %struct.list_head, i32, %struct.qstr, i32, %struct.dentry_operations*, %struct.super_block*, i32, i8*, [16 x i8] }
+	%struct.dentry_operations = type { i32 (%struct.dentry*, i32)*, i32 (%struct.dentry*, %struct.qstr*)*, i32 (%struct.dentry*, %struct.qstr*, %struct.qstr*)*, i32 (%struct.dentry*)*, void (%struct.dentry*)*, void (%struct.dentry*, %struct.inode*)* }
+	%struct.dev_mc_list = type { %struct.dev_mc_list*, [8 x i8], i8, i32, i32 }
+	%struct.dnotify_struct = type { %struct.dnotify_struct*, i32, i32, %struct.file*, %struct.files_struct* }
+	%struct.dquot = type { %struct.list_head, %struct.list_head, %struct.list_head, %struct.__wait_queue_head, %struct.__wait_queue_head, i32, i32, %struct.super_block*, i32, i16, i64, i16, i16, i32, %struct.mem_dqblk }
+	%struct.dquot_operations = type { void (%struct.inode*, i32)*, void (%struct.inode*)*, i32 (%struct.inode*, i64, i32)*, i32 (%struct.inode*, i32)*, void (%struct.inode*, i64)*, void (%struct.inode*, i32)*, i32 (%struct.inode*, %struct.iattr*)*, i32 (%struct.dquot*)* }
+	%struct.drm_clip_rect = type { i16, i16, i16, i16 }
+	%struct.drm_ctx_priv_map = type { i32, i8* }
+	%struct.drm_mga_indices = type { i32, i32, i32, i32 }
+	%struct.dst_entry = type { %struct.dst_entry*, %struct.IO_APIC_reg_00, i32, %struct.net_device*, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, %struct.neighbour*, %struct.hh_cache*, i32 (%struct.sk_buff*)*, i32 (%struct.sk_buff*)*, %struct.dst_ops*, [0 x i8] }
+	%struct.dst_ops = type { i16, i16, i32, i32 ()*, %struct.dst_entry* (%struct.dst_entry*, i32)*, %struct.dst_entry* (%struct.dst_entry*, %struct.sk_buff*)*, void (%struct.dst_entry*)*, %struct.dst_entry* (%struct.dst_entry*)*, void (%struct.sk_buff*)*, i32, %struct.IO_APIC_reg_00, %struct.kmem_cache_s* }
+	%struct.e820entry = type { i64, i64, i32 }
+	%struct.exec_domain = type { i8*, void (i32, %struct.pt_regs*)*, i8, i8, i32*, i32*, %struct.map_segment*, %struct.map_segment*, %struct.map_segment*, %struct.map_segment*, %struct.module*, %struct.exec_domain* }
+	%struct.ext2_inode_info = type { [15 x i32], i32, i32, i8, i8, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }
+	%struct.ext3_inode_info = type { [15 x i32], i32, i32, i32, i32, i32, i32, i32, i32, i32, %struct.list_head, i64, %struct.rw_semaphore }
+	%struct.fasync_struct = type { i32, i32, %struct.fasync_struct*, %struct.file* }
+	%struct.file = type { %struct.list_head, %struct.dentry*, %struct.vfsmount*, %struct.file_operations*, %struct.IO_APIC_reg_00, i32, i16, i64, i32, i32, i32, i32, i32, %struct.audio_buf_info, i32, i32, i32, i32, i8*, %struct.kiobuf*, i32 }
+	%struct.file_lock = type { %struct.file_lock*, %struct.list_head, %struct.list_head, %struct.files_struct*, i32, %struct.__wait_queue_head, %struct.file*, i8, i8, i64, i64, void (%struct.file_lock*)*, void (%struct.file_lock*)*, void (%struct.file_lock*)*, %struct.fasync_struct*, i32, { %struct.nfs_lock_info } }
+	%struct.file_operations = type { %struct.module*, i64 (%struct.file*, i64, i32)*, i32 (%struct.file*, i8*, i32, i64*)*, i32 (%struct.file*, i8*, i32, i64*)*, i32 (%struct.file*, i8*, i32 (i8*, i8*, i32, i64, i32, i32)*)*, i32 (%struct.file*, %struct.poll_table_struct*)*, i32 (%struct.inode*, %struct.file*, i32, i32)*, i32 (%struct.file*, %struct.vm_area_struct*)*, i32 (%struct.inode*, %struct.file*)*, i32 (%struct.file*)*, i32 (%struct.inode*, %struct.file*)*, i32 (%struct.file*, %struct.dentry*, i32)*, i32 (i32, %struct.file*, i32)*, i32 (%struct.file*, i32, %struct.file_lock*)*, i32 (%struct.file*, %struct.iovec*, i32, i64*)*, i32 (%struct.file*, %struct.iovec*, i32, i64*)*, i32 (%struct.file*, %struct.page*, i32, i32, i64*, i32)*, i32 (%struct.file*, i32, i32, i32, i32)* }
+	%struct.file_system_type = type { i8*, i32, %struct.super_block* (%struct.super_block*, i8*, i32)*, %struct.module*, %struct.file_system_type*, %struct.list_head }
+	%struct.files_struct = type { %struct.IO_APIC_reg_00, %typedef.rwlock_t, i32, i32, i32, %struct.file**, %typedef.__kernel_fd_set*, %typedef.__kernel_fd_set*, %typedef.__kernel_fd_set, %typedef.__kernel_fd_set, [32 x %struct.file*] }
+	%struct.fs_disk_quota = type { i8, i8, i16, i32, i64, i64, i64, i64, i64, i64, i32, i32, i16, i16, i32, i64, i64, i64, i32, i16, i16, [8 x i8] }
+	%struct.fs_quota_stat = type { i8, i16, i8, %struct.e820entry, %struct.e820entry, i32, i32, i32, i32, i16, i16 }
+	%struct.fs_struct = type { %struct.IO_APIC_reg_00, %typedef.rwlock_t, i32, %struct.dentry*, %struct.dentry*, %struct.dentry*, %struct.vfsmount*, %struct.vfsmount*, %struct.vfsmount* }
+	%struct.hh_cache = type { %struct.hh_cache*, %struct.IO_APIC_reg_00, i16, i32, i32 (%struct.sk_buff*)*, %typedef.rwlock_t, [32 x i32] }
+	%struct.i387_fxsave_struct = type { i16, i16, i16, i16, i32, i32, i32, i32, i32, i32, [32 x i32], [32 x i32], [56 x i32] }
+	%struct.iattr = type { i32, i16, i32, i32, i64, i32, i32, i32, i32 }
+	%struct.if_dqblk = type { i64, i64, i64, i64, i64, i64, i64, i64, i32 }
+	%struct.if_dqinfo = type { i64, i64, i32, i32 }
+	%struct.ifmap = type { i32, i32, i16, i8, i8, i8 }
+	%struct.ifreq = type { { [16 x i8] }, %typedef.dvd_authinfo }
+	%struct.inode = type { %struct.list_head, %struct.list_head, %struct.list_head, %struct.list_head, %struct.list_head, i32, %struct.IO_APIC_reg_00, i16, i16, i16, i32, i32, i16, i64, i32, i32, i32, i32, i32, i32, i32, i16, %struct.semaphore, %struct.rw_semaphore, %struct.semaphore, %struct.inode_operations*, %struct.file_operations*, %struct.super_block*, %struct.__wait_queue_head, %struct.file_lock*, %struct.address_space*, %struct.address_space, [2 x %struct.dquot*], %struct.list_head, %struct.pipe_inode_info*, %struct.block_device*, %struct.char_device*, i32, %struct.dnotify_struct*, i32, i32, i8, %struct.IO_APIC_reg_00, i32, i32, { %struct.ext2_inode_info, %struct.ext3_inode_info, %struct.msdos_inode_info, %struct.iso_inode_info, %struct.nfs_inode_info, %struct._drm_i810_overlay_t, %struct.shmem_inode_info, %struct.proc_inode_info, %struct.socket, %struct.usbdev_inode_info, i8* } }
+	%struct.inode_operations = type { i32 (%struct.inode*, %struct.dentry*, i32)*, %struct.dentry* (%struct.inode*, %struct.dentry*)*, i32 (%struct.dentry*, %struct.inode*, %struct.dentry*)*, i32 (%struct.inode*, %struct.dentry*)*, i32 (%struct.inode*, %struct.dentry*, i8*)*, i32 (%struct.inode*, %struct.dentry*, i32)*, i32 (%struct.inode*, %struct.dentry*)*, i32 (%struct.inode*, %struct.dentry*, i32, i32)*, i32 (%struct.inode*, %struct.dentry*, %struct.inode*, %struct.dentry*)*, i32 (%struct.dentry*, i8*, i32)*, i32 (%struct.dentry*, %struct.nameidata*)*, void (%struct.inode*)*, i32 (%struct.inode*, i32)*, i32 (%struct.dentry*)*, i32 (%struct.dentry*, %struct.iattr*)*, i32 (%struct.dentry*, %struct.iattr*)*, i32 (%struct.dentry*, i8*, i8*, i32, i32)*, i32 (%struct.dentry*, i8*, i8*, i32)*, i32 (%struct.dentry*, i8*, i32)*, i32 (%struct.dentry*, i8*)* }
+	%struct.iovec = type { i8*, i32 }
+	%struct.ip_options = type { i32, i8, i8, i8, i8, i8, i8, i8, i8, [0 x i8] }
+	%struct.isapnp_dma = type { i8, i8, %struct.isapnp_resources*, %struct.isapnp_dma* }
+	%struct.isapnp_irq = type { i16, i8, i8, %struct.isapnp_resources*, %struct.isapnp_irq* }
+	%struct.isapnp_mem = type { i32, i32, i32, i32, i8, i8, %struct.isapnp_resources*, %struct.isapnp_mem* }
+	%struct.isapnp_mem32 = type { [17 x i8], %struct.isapnp_resources*, %struct.isapnp_mem32* }
+	%struct.isapnp_port = type { i16, i16, i8, i8, i8, i8, %struct.isapnp_resources*, %struct.isapnp_port* }
+	%struct.isapnp_resources = type { i16, i16, %struct.isapnp_port*, %struct.isapnp_irq*, %struct.isapnp_dma*, %struct.isapnp_mem*, %struct.isapnp_mem32*, %struct.pci_dev*, %struct.isapnp_resources*, %struct.isapnp_resources* }
+	%struct.iso_inode_info = type { i32, i8, [3 x i8], i32, i32 }
 	%struct.iw_handler_def = type opaque
 	%struct.iw_statistics = type opaque
 	%struct.k_sigaction = type { %struct.sigaction }
-	%struct.kern_ipc_perm = type { int, uint, uint, uint, uint, ushort, uint }
-	%struct.kiobuf = type { int, int, int, int, uint, %struct.page**, %struct.buffer_head**, uint*, %struct.bluez_skb_cb, int, void (%struct.kiobuf*)*, %struct.__wait_queue_head }
-	%struct.kmem_cache_s = type { %struct.list_head, %struct.list_head, %struct.list_head, uint, uint, uint, %struct.IO_APIC_reg_00, uint, uint, uint, uint, uint, uint, %struct.kmem_cache_s*, uint, uint, void (sbyte*, %struct.kmem_cache_s*, uint)*, void (sbyte*, %struct.kmem_cache_s*, uint)*, uint, [20 x sbyte], %struct.list_head, [32 x %struct._drm_i810_overlay_t*], uint }
-	%struct.linux_binfmt = type { %struct.linux_binfmt*, %struct.module*, int (%struct.linux_binprm*, %struct.pt_regs*)*, int (%struct.file*)*, int (int, %struct.pt_regs*, %struct.file*)*, uint, int (%struct.linux_binprm*, sbyte*)* }
-	%struct.linux_binprm = type { [128 x sbyte], [32 x %struct.page*], uint, int, %struct.file*, int, int, uint, uint, uint, int, int, sbyte*, uint, uint }
+	%struct.kern_ipc_perm = type { i32, i32, i32, i32, i32, i16, i32 }
+	%struct.kiobuf = type { i32, i32, i32, i32, i32, %struct.page**, %struct.buffer_head**, i32*, %struct.IO_APIC_reg_00, i32, void (%struct.kiobuf*)*, %struct.__wait_queue_head }
+	%struct.kmem_cache_s = type { %struct.list_head, %struct.list_head, %struct.list_head, i32, i32, i32, %struct.IO_APIC_reg_00, i32, i32, i32, i32, i32, i32, %struct.kmem_cache_s*, i32, i32, void (i8*, %struct.kmem_cache_s*, i32)*, void (i8*, %struct.kmem_cache_s*, i32)*, i32, [20 x i8], %struct.list_head, [32 x %struct._drm_i810_overlay_t*], i32 }
+	%struct.linux_binfmt = type { %struct.linux_binfmt*, %struct.module*, i32 (%struct.linux_binprm*, %struct.pt_regs*)*, i32 (%struct.file*)*, i32 (i32, %struct.pt_regs*, %struct.file*)*, i32, i32 (%struct.linux_binprm*, i8*)* }
+	%struct.linux_binprm = type { [128 x i8], [32 x %struct.page*], i32, i32, %struct.file*, i32, i32, i32, i32, i32, i32, i32, i8*, i32, i32 }
 	%struct.list_head = type { %struct.list_head*, %struct.list_head* }
-	%struct.llva_sigcontext = type { %typedef.llva_icontext_t, %typedef.llva_fp_state_t, uint, uint, uint, uint, [1 x uint], sbyte* }
+	%struct.llva_sigcontext = type { %typedef.llva_icontext_t, %typedef.llva_fp_state_t, i32, i32, i32, i32, [1 x i32], i8* }
 	%struct.map_segment = type opaque
-	%struct.mem_dqblk = type { uint, uint, ulong, uint, uint, uint, int, int }
-	%struct.mem_dqinfo = type { %struct.quota_format_type*, int, uint, uint, { %struct.ViceFid } }
-	%struct.mm_struct = type { %struct.vm_area_struct*, %struct.rb_root_s, %struct.vm_area_struct*, %struct.IO_APIC_reg_00*, %struct.bluez_skb_cb, %struct.bluez_skb_cb, int, %struct.rw_semaphore, %struct.IO_APIC_reg_00, %struct.list_head, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, %struct.iovec }
-	%struct.module = type { uint, %struct.module*, sbyte*, uint, %struct.bluez_skb_cb, uint, uint, uint, %struct.drm_ctx_priv_map*, %struct.module_ref*, %struct.module_ref*, int ()*, void ()*, %struct._drm_i810_overlay_t*, %struct._drm_i810_overlay_t*, %struct.module_persist*, %struct.module_persist*, int ()*, int, sbyte*, sbyte*, sbyte*, sbyte*, sbyte* }
+	%struct.mem_dqblk = type { i32, i32, i64, i32, i32, i32, i32, i32 }
+	%struct.mem_dqinfo = type { %struct.quota_format_type*, i32, i32, i32, { %struct.ViceFid } }
+	%struct.mm_struct = type { %struct.vm_area_struct*, %struct.rb_root_s, %struct.vm_area_struct*, %struct.IO_APIC_reg_00*, %struct.IO_APIC_reg_00, %struct.IO_APIC_reg_00, i32, %struct.rw_semaphore, %struct.IO_APIC_reg_00, %struct.list_head, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, %struct.iovec }
+	%struct.module = type { i32, %struct.module*, i8*, i32, %struct.IO_APIC_reg_00, i32, i32, i32, %struct.drm_ctx_priv_map*, %struct.module_ref*, %struct.module_ref*, i32 ()*, void ()*, %struct._drm_i810_overlay_t*, %struct._drm_i810_overlay_t*, %struct.module_persist*, %struct.module_persist*, i32 ()*, i32, i8*, i8*, i8*, i8*, i8* }
 	%struct.module_persist = type opaque
 	%struct.module_ref = type { %struct.module*, %struct.module*, %struct.module_ref* }
-	%struct.msdos_inode_info = type { uint, int, int, int, int, int, %struct.inode*, %struct.list_head }
-	%struct.msghdr = type { sbyte*, int, %struct.iovec*, uint, sbyte*, uint, uint }
-	%struct.msq_setbuf = type { uint, uint, uint, ushort }
-	%struct.nameidata = type { %struct.dentry*, %struct.vfsmount*, %struct.qstr, uint, int }
-	%struct.namespace = type { %struct.bluez_skb_cb, %struct.vfsmount*, %struct.list_head, %struct.rw_semaphore }
-	%struct.neigh_ops = type { int, void (%struct.neighbour*)*, void (%struct.neighbour*, %struct.sk_buff*)*, void (%struct.neighbour*, %struct.sk_buff*)*, int (%struct.sk_buff*)*, int (%struct.sk_buff*)*, int (%struct.sk_buff*)*, int (%struct.sk_buff*)* }
-	%struct.neigh_parms = type { %struct.neigh_parms*, int (%struct.neighbour*)*, %struct.neigh_table*, int, sbyte*, sbyte*, int, int, int, int, int, int, int, int, int, int, int, int, int }
-	%struct.neigh_table = type { %struct.neigh_table*, int, int, int, uint (sbyte*, %struct.net_device*)*, int (%struct.neighbour*)*, int (%struct.pneigh_entry*)*, void (%struct.pneigh_entry*)*, void (%struct.sk_buff*)*, sbyte*, %struct.neigh_parms, int, int, int, int, uint, %struct.timer_list, %struct.timer_list, %struct.sk_buff_head, int, %typedef.rwlock_t, uint, %struct.neigh_parms*, %struct.kmem_cache_s*, %struct.tasklet_struct, %struct.cramfs_info, [32 x %struct.neighbour*], [16 x %struct.pneigh_entry*] }
-	%struct.neighbour = type { %struct.neighbour*, %struct.neigh_table*, %struct.neigh_parms*, %struct.net_device*, uint, uint, uint, ubyte, ubyte, ubyte, ubyte, %struct.bluez_skb_cb, %typedef.rwlock_t, [8 x ubyte], %struct.hh_cache*, %struct.bluez_skb_cb, int (%struct.sk_buff*)*, %struct.sk_buff_head, %struct.timer_list, %struct.neigh_ops*, [0 x ubyte] }
+	%struct.msdos_inode_info = type { i32, i32, i32, i32, i32, i32, %struct.inode*, %struct.list_head }
+	%struct.msghdr = type { i8*, i32, %struct.iovec*, i32, i8*, i32, i32 }
+	%struct.msq_setbuf = type { i32, i32, i32, i16 }
+	%struct.nameidata = type { %struct.dentry*, %struct.vfsmount*, %struct.qstr, i32, i32 }
+	%struct.namespace = type { %struct.IO_APIC_reg_00, %struct.vfsmount*, %struct.list_head, %struct.rw_semaphore }
+	%struct.neigh_ops = type { i32, void (%struct.neighbour*)*, void (%struct.neighbour*, %struct.sk_buff*)*, void (%struct.neighbour*, %struct.sk_buff*)*, i32 (%struct.sk_buff*)*, i32 (%struct.sk_buff*)*, i32 (%struct.sk_buff*)*, i32 (%struct.sk_buff*)* }
+	%struct.neigh_parms = type { %struct.neigh_parms*, i32 (%struct.neighbour*)*, %struct.neigh_table*, i32, i8*, i8*, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }
+	%struct.neigh_table = type { %struct.neigh_table*, i32, i32, i32, i32 (i8*, %struct.net_device*)*, i32 (%struct.neighbour*)*, i32 (%struct.pneigh_entry*)*, void (%struct.pneigh_entry*)*, void (%struct.sk_buff*)*, i8*, %struct.neigh_parms, i32, i32, i32, i32, i32, %struct.timer_list, %struct.timer_list, %struct.sk_buff_head, i32, %typedef.rwlock_t, i32, %struct.neigh_parms*, %struct.kmem_cache_s*, %struct.tasklet_struct, %struct.audio_buf_info, [32 x %struct.neighbour*], [16 x %struct.pneigh_entry*] }
+	%struct.neighbour = type { %struct.neighbour*, %struct.neigh_table*, %struct.neigh_parms*, %struct.net_device*, i32, i32, i32, i8, i8, i8, i8, %struct.IO_APIC_reg_00, %typedef.rwlock_t, [8 x i8], %struct.hh_cache*, %struct.IO_APIC_reg_00, i32 (%struct.sk_buff*)*, %struct.sk_buff_head, %struct.timer_list, %struct.neigh_ops*, [0 x i8] }
 	%struct.net_bridge_port = type opaque
-	%struct.net_device = type { [16 x sbyte], uint, uint, uint, uint, uint, uint, ubyte, ubyte, uint, %struct.net_device*, int (%struct.net_device*)*, %struct.net_device*, int, int, %struct.net_device_stats* (%struct.net_device*)*, %struct.iw_statistics* (%struct.net_device*)*, %struct.iw_handler_def*, uint, uint, ushort, ushort, ushort, ushort, uint, ushort, ushort, sbyte*, %struct.net_device*, [8 x ubyte], [8 x ubyte], ubyte, %struct.dev_mc_list*, int, int, int, int, %struct.timer_list, sbyte*, sbyte*, sbyte*, sbyte*, sbyte*, %struct.list_head, int, int, %struct.Qdisc*, %struct.Qdisc*, %struct.Qdisc*, %struct.Qdisc*, uint, %struct.IO_APIC_reg_00, int, %struct.IO_APIC_reg_00, %struct.bluez_skb_cb, int, int, void (%struct.net_device*)*, void (%struct.net_device*)*, int (%struct.net_device*)*, int (%struct.net_device*)*, int (%struct.sk_buff*, %struct.net_device*)*, int (%struct.net_device*, int*)*, int (%struct.sk_buff*, %struct.net_device*, ushort, sbyte*, sbyte*, uint)*, int (%struct.sk_buff*)*, void (%struct.net_device*)*, int (%struct.net_device*, sbyte*)*, int (%struct.net_device*, %struct.ifreq*, int)*, int (%struct.net_device*, %struct.ifmap*)*, int (%struct.neighbour*, %struct.hh_cache*)*, void (%struct.hh_cache*, %struct.net_device*, ubyte*)*, int (%struct.net_device*, int)*, void (%struct.net_device*)*, void (%struct.net_device*, %struct.vlan_group*)*, void (%struct.net_device*, ushort)*, void (%struct.net_device*, ushort)*, int (%struct.sk_buff*, ubyte*)*, int (%struct.net_device*, %struct.neigh_parms*)*, int (%struct.net_device*, %struct.dst_entry*)*, %struct.module*, %struct.net_bridge_port* }
-	%struct.net_device_stats = type { uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint }
-	%struct.nf_conntrack = type { %struct.bluez_skb_cb, void (%struct.nf_conntrack*)* }
+	%struct.net_device = type { [16 x i8], i32, i32, i32, i32, i32, i32, i8, i8, i32, %struct.net_device*, i32 (%struct.net_device*)*, %struct.net_device*, i32, i32, %struct.net_device_stats* (%struct.net_device*)*, %struct.iw_statistics* (%struct.net_device*)*, %struct.iw_handler_def*, i32, i32, i16, i16, i16, i16, i32, i16, i16, i8*, %struct.net_device*, [8 x i8], [8 x i8], i8, %struct.dev_mc_list*, i32, i32, i32, i32, %struct.timer_list, i8*, i8*, i8*, i8*, i8*, %struct.list_head, i32, i32, %struct.Qdisc*, %struct.Qdisc*, %struct.Qdisc*, %struct.Qdisc*, i32, %struct.IO_APIC_reg_00, i32, %struct.IO_APIC_reg_00, %struct.IO_APIC_reg_00, i32, i32, void (%struct.net_device*)*, void (%struct.net_device*)*, i32 (%struct.net_device*)*, i32 (%struct.net_device*)*, i32 (%struct.sk_buff*, %struct.net_device*)*, i32 (%struct.net_device*, i32*)*, i32 (%struct.sk_buff*, %struct.net_device*, i16, i8*, i8*, i32)*, i32 (%struct.sk_buff*)*, void (%struct.net_device*)*, i32 (%struct.net_device*, i8*)*, i32 (%struct.net_device*, %struct.ifreq*, i32)*, i32 (%struct.net_device*, %struct.ifmap*)*, i32 (%struct.neighbour*, %struct.hh_cache*)*, void (%struct.hh_cache*, %struct.net_device*, i8*)*, i32 (%struct.net_device*, i32)*, void (%struct.net_device*)*, void (%struct.net_device*, %struct.vlan_group*)*, void (%struct.net_device*, i16)*, void (%struct.net_device*, i16)*, i32 (%struct.sk_buff*, i8*)*, i32 (%struct.net_device*, %struct.neigh_parms*)*, i32 (%struct.net_device*, %struct.dst_entry*)*, %struct.module*, %struct.net_bridge_port* }
+	%struct.net_device_stats = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }
+	%struct.nf_conntrack = type { %struct.IO_APIC_reg_00, void (%struct.nf_conntrack*)* }
 	%struct.nf_ct_info = type { %struct.nf_conntrack* }
-	%struct.nfs_fh = type { ushort, [64 x ubyte] }
-	%struct.nfs_inode_info = type { ulong, %struct.nfs_fh, ushort, uint, ulong, ulong, ulong, uint, uint, uint, [2 x uint], %struct.list_head, %struct.list_head, %struct.list_head, %struct.list_head, uint, uint, uint, uint, %struct.rpc_cred* }
-	%struct.nfs_lock_info = type { uint, uint, %struct.nlm_host* }
+	%struct.nfs_fh = type { i16, [64 x i8] }
+	%struct.nfs_inode_info = type { i64, %struct.nfs_fh, i16, i32, i64, i64, i64, i32, i32, i32, [2 x i32], %struct.list_head, %struct.list_head, %struct.list_head, %struct.list_head, i32, i32, i32, i32, %struct.rpc_cred* }
+	%struct.nfs_lock_info = type { i32, i32, %struct.nlm_host* }
 	%struct.nlm_host = type opaque
-	%struct.open_request = type { %struct.open_request*, uint, uint, ushort, ushort, ubyte, ubyte, ushort, uint, uint, uint, uint, %struct.or_calltable*, %struct.sock*, { %struct.tcp_v4_open_req } }
-	%struct.or_calltable = type { int, int (%struct.sock*, %struct.open_request*, %struct.dst_entry*)*, void (%struct.sk_buff*, %struct.open_request*)*, void (%struct.open_request*)*, void (%struct.sk_buff*)* }
-	%struct.page = type { %struct.list_head, %struct.address_space*, uint, %struct.page*, %struct.bluez_skb_cb, uint, %struct.list_head, %struct.page**, %struct.buffer_head* }
-	%struct.pci_bus = type { %struct.list_head, %struct.pci_bus*, %struct.list_head, %struct.list_head, %struct.pci_dev*, [4 x %struct.resource*], %struct.pci_ops*, sbyte*, %struct.proc_dir_entry*, ubyte, ubyte, ubyte, ubyte, [48 x sbyte], ushort, ushort, uint, ubyte, ubyte, ubyte, ubyte }
-	%struct.pci_dev = type { %struct.list_head, %struct.list_head, %struct.pci_bus*, %struct.pci_bus*, sbyte*, %struct.proc_dir_entry*, uint, ushort, ushort, ushort, ushort, uint, ubyte, ubyte, %struct.pci_driver*, sbyte*, ulong, uint, [4 x ushort], [4 x ushort], uint, [12 x %struct.resource], [2 x %struct.resource], [2 x %struct.resource], [90 x sbyte], [8 x sbyte], int, int, ushort, ushort, int (%struct.pci_dev*)*, int (%struct.pci_dev*)*, int (%struct.pci_dev*)* }
-	%struct.pci_device_id = type { uint, uint, uint, uint, uint, uint, uint }
-	%struct.pci_driver = type { %struct.list_head, sbyte*, %struct.pci_device_id*, int (%struct.pci_dev*, %struct.pci_device_id*)*, void (%struct.pci_dev*)*, int (%struct.pci_dev*, uint)*, int (%struct.pci_dev*, uint)*, int (%struct.pci_dev*)*, int (%struct.pci_dev*, uint, int)* }
-	%struct.pci_ops = type { int (%struct.pci_dev*, int, ubyte*)*, int (%struct.pci_dev*, int, ushort*)*, int (%struct.pci_dev*, int, uint*)*, int (%struct.pci_dev*, int, ubyte)*, int (%struct.pci_dev*, int, ushort)*, int (%struct.pci_dev*, int, uint)* }
-	%struct.pipe_inode_info = type { %struct.__wait_queue_head, sbyte*, uint, uint, uint, uint, uint, uint, uint, uint }
-	%struct.pneigh_entry = type { %struct.pneigh_entry*, %struct.net_device*, [0 x ubyte] }
+	%struct.open_request = type { %struct.open_request*, i32, i32, i16, i16, i8, i8, i16, i32, i32, i32, i32, %struct.or_calltable*, %struct.sock*, { %struct.tcp_v4_open_req } }
+	%struct.or_calltable = type { i32, i32 (%struct.sock*, %struct.open_request*, %struct.dst_entry*)*, void (%struct.sk_buff*, %struct.open_request*)*, void (%struct.open_request*)*, void (%struct.sk_buff*)* }
+	%struct.page = type { %struct.list_head, %struct.address_space*, i32, %struct.page*, %struct.IO_APIC_reg_00, i32, %struct.list_head, %struct.page**, %struct.buffer_head* }
+	%struct.pci_bus = type { %struct.list_head, %struct.pci_bus*, %struct.list_head, %struct.list_head, %struct.pci_dev*, [4 x %struct.resource*], %struct.pci_ops*, i8*, %struct.proc_dir_entry*, i8, i8, i8, i8, [48 x i8], i16, i16, i32, i8, i8, i8, i8 }
+	%struct.pci_dev = type { %struct.list_head, %struct.list_head, %struct.pci_bus*, %struct.pci_bus*, i8*, %struct.proc_dir_entry*, i32, i16, i16, i16, i16, i32, i8, i8, %struct.pci_driver*, i8*, i64, i32, [4 x i16], [4 x i16], i32, [12 x %struct.resource], [2 x %struct.resource], [2 x %struct.resource], [90 x i8], [8 x i8], i32, i32, i16, i16, i32 (%struct.pci_dev*)*, i32 (%struct.pci_dev*)*, i32 (%struct.pci_dev*)* }
+	%struct.pci_device_id = type { i32, i32, i32, i32, i32, i32, i32 }
+	%struct.pci_driver = type { %struct.list_head, i8*, %struct.pci_device_id*, i32 (%struct.pci_dev*, %struct.pci_device_id*)*, void (%struct.pci_dev*)*, i32 (%struct.pci_dev*, i32)*, i32 (%struct.pci_dev*, i32)*, i32 (%struct.pci_dev*)*, i32 (%struct.pci_dev*, i32, i32)* }
+	%struct.pci_ops = type { i32 (%struct.pci_dev*, i32, i8*)*, i32 (%struct.pci_dev*, i32, i16*)*, i32 (%struct.pci_dev*, i32, i32*)*, i32 (%struct.pci_dev*, i32, i8)*, i32 (%struct.pci_dev*, i32, i16)*, i32 (%struct.pci_dev*, i32, i32)* }
+	%struct.pipe_inode_info = type { %struct.__wait_queue_head, i8*, i32, i32, i32, i32, i32, i32, i32, i32 }
+	%struct.pneigh_entry = type { %struct.pneigh_entry*, %struct.net_device*, [0 x i8] }
 	%struct.poll_table_entry = type { %struct.file*, %struct.__wait_queue, %struct.__wait_queue_head* }
 	%struct.poll_table_page = type { %struct.poll_table_page*, %struct.poll_table_entry*, [0 x %struct.poll_table_entry] }
-	%struct.poll_table_struct = type { int, %struct.poll_table_page* }
-	%struct.proc_dir_entry = type { ushort, ushort, sbyte*, ushort, ushort, uint, uint, uint, %struct.inode_operations*, %struct.file_operations*, int (sbyte*, sbyte**, int, int)*, %struct.module*, %struct.proc_dir_entry*, %struct.proc_dir_entry*, %struct.proc_dir_entry*, sbyte*, int (sbyte*, sbyte**, int, int, int*, sbyte*)*, int (%struct.file*, sbyte*, uint, sbyte*)*, %struct.bluez_skb_cb, int, ushort }
-	%struct.proc_inode_info = type { %struct.task_struct*, int, { int (%struct.task_struct*, sbyte*)* }, %struct.file* }
-	%struct.proto = type { void (%struct.sock*, int)*, int (%struct.sock*, %struct.sockaddr*, int)*, int (%struct.sock*, int)*, %struct.sock* (%struct.sock*, int, int*)*, int (%struct.sock*, int, uint)*, int (%struct.sock*)*, int (%struct.sock*)*, void (%struct.sock*, int)*, int (%struct.sock*, int, int, sbyte*, int)*, int (%struct.sock*, int, int, sbyte*, int*)*, int (%struct.sock*, %struct.msghdr*, int)*, int (%struct.sock*, %struct.msghdr*, int, int, int, int*)*, int (%struct.sock*, %struct.sockaddr*, int)*, int (%struct.sock*, %struct.sk_buff*)*, void (%struct.sock*)*, void (%struct.sock*)*, int (%struct.sock*, ushort)*, [32 x sbyte], [32 x { int, [28 x ubyte] }] }
-	%struct.proto_ops = type { int, int (%struct.socket*)*, int (%struct.socket*, %struct.sockaddr*, int)*, int (%struct.socket*, %struct.sockaddr*, int, int)*, int (%struct.socket*, %struct.socket*)*, int (%struct.socket*, %struct.socket*, int)*, int (%struct.socket*, %struct.sockaddr*, int*, int)*, uint (%struct.file*, %struct.socket*, %struct.poll_table_struct*)*, int (%struct.socket*, uint, uint)*, int (%struct.socket*, int)*, int (%struct.socket*, int)*, int (%struct.socket*, int, int, sbyte*, int)*, int (%struct.socket*, int, int, sbyte*, int*)*, int (%struct.socket*, %struct.msghdr*, int, %struct.scm_cookie*)*, int (%struct.socket*, %struct.msghdr*, int, int, %struct.scm_cookie*)*, int (%struct.file*, %struct.socket*, %struct.vm_area_struct*)*, int (%struct.socket*, %struct.page*, int, uint, int)* }
-	%struct.pt_regs = type { int, int, int, int, int, int, int, int, int, int, int, int, int, int, int }
-	%struct.qdisc_walker = type { int, int, int, int (%struct.Qdisc*, uint, %struct.qdisc_walker*)* }
-	%struct.qstr = type { ubyte*, uint, uint }
-	%struct.quota_format_ops = type { int (%struct.super_block*, int)*, int (%struct.super_block*, int)*, int (%struct.super_block*, int)*, int (%struct.super_block*, int)*, int (%struct.dquot*)*, int (%struct.dquot*)* }
-	%struct.quota_format_type = type { int, %struct.quota_format_ops*, %struct.module*, %struct.quota_format_type* }
-	%struct.quota_info = type { uint, %struct.semaphore, %struct.semaphore, [2 x %struct.file*], [2 x %struct.mem_dqinfo], [2 x %struct.quota_format_ops*] }
-	%struct.quotactl_ops = type { int (%struct.super_block*, int, int, sbyte*)*, int (%struct.super_block*, int)*, int (%struct.super_block*, int)*, int (%struct.super_block*, int, %struct.if_dqinfo*)*, int (%struct.super_block*, int, %struct.if_dqinfo*)*, int (%struct.super_block*, int, uint, %struct.if_dqblk*)*, int (%struct.super_block*, int, uint, %struct.if_dqblk*)*, int (%struct.super_block*, %struct.fs_quota_stat*)*, int (%struct.super_block*, uint, int)*, int (%struct.super_block*, int, uint, %struct.fs_disk_quota*)*, int (%struct.super_block*, int, uint, %struct.fs_disk_quota*)* }
-	%struct.rb_node_s = type { %struct.rb_node_s*, int, %struct.rb_node_s*, %struct.rb_node_s* }
+	%struct.poll_table_struct = type { i32, %struct.poll_table_page* }
+	%struct.proc_dir_entry = type { i16, i16, i8*, i16, i16, i32, i32, i32, %struct.inode_operations*, %struct.file_operations*, i32 (i8*, i8**, i32, i32)*, %struct.module*, %struct.proc_dir_entry*, %struct.proc_dir_entry*, %struct.proc_dir_entry*, i8*, i32 (i8*, i8**, i32, i32, i32*, i8*)*, i32 (%struct.file*, i8*, i32, i8*)*, %struct.IO_APIC_reg_00, i32, i16 }
+	%struct.proc_inode_info = type { %struct.task_struct*, i32, { i32 (%struct.task_struct*, i8*)* }, %struct.file* }
+	%struct.proto = type { void (%struct.sock*, i32)*, i32 (%struct.sock*, %struct.sockaddr*, i32)*, i32 (%struct.sock*, i32)*, %struct.sock* (%struct.sock*, i32, i32*)*, i32 (%struct.sock*, i32, i32)*, i32 (%struct.sock*)*, i32 (%struct.sock*)*, void (%struct.sock*, i32)*, i32 (%struct.sock*, i32, i32, i8*, i32)*, i32 (%struct.sock*, i32, i32, i8*, i32*)*, i32 (%struct.sock*, %struct.msghdr*, i32)*, i32 (%struct.sock*, %struct.msghdr*, i32, i32, i32, i32*)*, i32 (%struct.sock*, %struct.sockaddr*, i32)*, i32 (%struct.sock*, %struct.sk_buff*)*, void (%struct.sock*)*, void (%struct.sock*)*, i32 (%struct.sock*, i16)*, [32 x i8], [32 x { i32, [28 x i8] }] }
+	%struct.proto_ops = type { i32, i32 (%struct.socket*)*, i32 (%struct.socket*, %struct.sockaddr*, i32)*, i32 (%struct.socket*, %struct.sockaddr*, i32, i32)*, i32 (%struct.socket*, %struct.socket*)*, i32 (%struct.socket*, %struct.socket*, i32)*, i32 (%struct.socket*, %struct.sockaddr*, i32*, i32)*, i32 (%struct.file*, %struct.socket*, %struct.poll_table_struct*)*, i32 (%struct.socket*, i32, i32)*, i32 (%struct.socket*, i32)*, i32 (%struct.socket*, i32)*, i32 (%struct.socket*, i32, i32, i8*, i32)*, i32 (%struct.socket*, i32, i32, i8*, i32*)*, i32 (%struct.socket*, %struct.msghdr*, i32, %struct.scm_cookie*)*, i32 (%struct.socket*, %struct.msghdr*, i32, i32, %struct.scm_cookie*)*, i32 (%struct.file*, %struct.socket*, %struct.vm_area_struct*)*, i32 (%struct.socket*, %struct.page*, i32, i32, i32)* }
+	%struct.pt_regs = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }
+	%struct.qdisc_walker = type { i32, i32, i32, i32 (%struct.Qdisc*, i32, %struct.qdisc_walker*)* }
+	%struct.qstr = type { i8*, i32, i32 }
+	%struct.quota_format_ops = type { i32 (%struct.super_block*, i32)*, i32 (%struct.super_block*, i32)*, i32 (%struct.super_block*, i32)*, i32 (%struct.super_block*, i32)*, i32 (%struct.dquot*)*, i32 (%struct.dquot*)* }
+	%struct.quota_format_type = type { i32, %struct.quota_format_ops*, %struct.module*, %struct.quota_format_type* }
+	%struct.quota_info = type { i32, %struct.semaphore, %struct.semaphore, [2 x %struct.file*], [2 x %struct.mem_dqinfo], [2 x %struct.quota_format_ops*] }
+	%struct.quotactl_ops = type { i32 (%struct.super_block*, i32, i32, i8*)*, i32 (%struct.super_block*, i32)*, i32 (%struct.super_block*, i32)*, i32 (%struct.super_block*, i32, %struct.if_dqinfo*)*, i32 (%struct.super_block*, i32, %struct.if_dqinfo*)*, i32 (%struct.super_block*, i32, i32, %struct.if_dqblk*)*, i32 (%struct.super_block*, i32, i32, %struct.if_dqblk*)*, i32 (%struct.super_block*, %struct.fs_quota_stat*)*, i32 (%struct.super_block*, i32, i32)*, i32 (%struct.super_block*, i32, i32, %struct.fs_disk_quota*)*, i32 (%struct.super_block*, i32, i32, %struct.fs_disk_quota*)* }
+	%struct.rb_node_s = type { %struct.rb_node_s*, i32, %struct.rb_node_s*, %struct.rb_node_s* }
 	%struct.rb_root_s = type { %struct.rb_node_s* }
-	%struct.resource = type { sbyte*, uint, uint, uint, %struct.resource*, %struct.resource*, %struct.resource* }
-	%struct.revectored_struct = type { [8 x uint] }
-	%struct.rpc_auth = type { [8 x %struct.rpc_cred*], uint, uint, uint, uint, uint, %struct.rpc_authops* }
-	%struct.rpc_authops = type { uint, sbyte*, %struct.rpc_auth* (%struct.rpc_clnt*)*, void (%struct.rpc_auth*)*, %struct.rpc_cred* (int)* }
-	%struct.rpc_clnt = type { %struct.bluez_skb_cb, %struct.rpc_xprt*, %struct.rpc_procinfo*, uint, sbyte*, sbyte*, %struct.rpc_auth*, %struct.rpc_stat*, uint, uint, uint, %struct.rpc_rtt, %struct.msq_setbuf, %struct.rpc_wait_queue, int, [32 x sbyte] }
-	%struct.rpc_cred = type { %struct.rpc_cred*, %struct.rpc_auth*, %struct.rpc_credops*, uint, %struct.bluez_skb_cb, ushort, uint, uint }
-	%struct.rpc_credops = type { void (%struct.rpc_cred*)*, int (%struct.rpc_cred*, int)*, uint* (%struct.rpc_task*, uint*, int)*, int (%struct.rpc_task*)*, uint* (%struct.rpc_task*, uint*)* }
-	%struct.rpc_message = type { uint, sbyte*, sbyte*, %struct.rpc_cred* }
-	%struct.rpc_procinfo = type { sbyte*, int (sbyte*, uint*, sbyte*)*, int (sbyte*, uint*, sbyte*)*, uint, uint, uint }
-	%struct.rpc_program = type { sbyte*, uint, uint, %struct.rpc_version**, %struct.rpc_stat* }
-	%struct.rpc_rqst = type { %struct.rpc_xprt*, %struct.rpc_timeout, %struct.xdr_buf, %struct.xdr_buf, %struct.rpc_task*, uint, %struct.rpc_rqst*, int, int, %struct.list_head, %struct.xdr_buf, [2 x uint], uint, int, int, int }
-	%struct.rpc_rtt = type { int, [5 x int], [5 x int], %struct.bluez_skb_cb }
-	%struct.rpc_stat = type { %struct.rpc_program*, uint, uint, uint, uint, uint, uint, uint, uint, uint }
-	%struct.rpc_task = type { %struct.list_head, uint, %struct.list_head, %struct.rpc_clnt*, %struct.rpc_rqst*, int, %struct.rpc_wait_queue*, %struct.rpc_message, uint*, ubyte, ubyte, ubyte, void (%struct.rpc_task*)*, void (%struct.rpc_task*)*, void (%struct.rpc_task*)*, void (%struct.rpc_task*)*, void (%struct.rpc_task*)*, sbyte*, %struct.timer_list, %struct.__wait_queue_head, uint, ushort, ubyte, uint, ushort }
-	%struct.rpc_timeout = type { uint, uint, uint, uint, short, ubyte }
-	%struct.rpc_version = type { uint, uint, %struct.rpc_procinfo* }
-	%struct.rpc_wait_queue = type { %struct.list_head, sbyte* }
-	%struct.rpc_xprt = type { %struct.socket*, %struct.sock*, %struct.rpc_timeout, %struct.sockaddr_in, int, uint, uint, uint, uint, %struct.rpc_wait_queue, %struct.rpc_wait_queue, %struct.rpc_wait_queue, %struct.rpc_wait_queue, %struct.rpc_rqst*, [16 x %struct.rpc_rqst], uint, ubyte, uint, uint, uint, uint, uint, uint, %struct.IO_APIC_reg_00, %struct.IO_APIC_reg_00, %struct.rpc_task*, %struct.list_head, void (%struct.sock*, int)*, void (%struct.sock*)*, void (%struct.sock*)*, %struct.__wait_queue_head }
-	%struct.rw_semaphore = type { int, %struct.IO_APIC_reg_00, %struct.list_head }
-	%struct.scm_cookie = type { %struct.ViceFid, %struct.scm_fp_list*, uint }
-	%struct.scm_fp_list = type { int, [255 x %struct.file*] }
-	%struct.sem_array = type { %struct.kern_ipc_perm, int, int, %struct.autofs_packet_hdr*, %struct.sem_queue*, %struct.sem_queue**, %struct.sem_undo*, uint }
-	%struct.sem_queue = type { %struct.sem_queue*, %struct.sem_queue**, %struct.task_struct*, %struct.sem_undo*, int, int, %struct.sem_array*, int, %struct.sembuf*, int, int }
-	%struct.sem_undo = type { %struct.sem_undo*, %struct.sem_undo*, int, short* }
-	%struct.semaphore = type { %struct.bluez_skb_cb, int, %struct.__wait_queue_head }
-	%struct.sembuf = type { ushort, short, short }
-	%struct.seq_file = type { sbyte*, uint, uint, uint, long, %struct.semaphore, %struct.seq_operations*, sbyte* }
-	%struct.seq_operations = type { sbyte* (%struct.seq_file*, long*)*, void (%struct.seq_file*, sbyte*)*, sbyte* (%struct.seq_file*, sbyte*, long*)*, int (%struct.seq_file*, sbyte*)* }
-	%struct.shmem_inode_info = type { %struct.IO_APIC_reg_00, uint, [16 x %struct.IO_APIC_reg_00], sbyte**, uint, uint, %struct.list_head, %struct.inode* }
-	%struct.sigaction = type { void (int)*, uint, void ()*, %typedef.sigset_t }
-	%struct.siginfo = type { int, int, int, { [29 x int] } }
-	%struct.signal_struct = type { %struct.bluez_skb_cb, [64 x %struct.k_sigaction], %struct.IO_APIC_reg_00 }
-	%struct.sigpending = type { %struct.sigqueue*, %struct.sigqueue**, %typedef.sigset_t }
+	%struct.resource = type { i8*, i32, i32, i32, %struct.resource*, %struct.resource*, %struct.resource* }
+	%struct.revectored_struct = type { [8 x i32] }
+	%struct.rpc_auth = type { [8 x %struct.rpc_cred*], i32, i32, i32, i32, i32, %struct.rpc_authops* }
+	%struct.rpc_authops = type { i32, i8*, %struct.rpc_auth* (%struct.rpc_clnt*)*, void (%struct.rpc_auth*)*, %struct.rpc_cred* (i32)* }
+	%struct.rpc_clnt = type { %struct.IO_APIC_reg_00, %struct.rpc_xprt*, %struct.rpc_procinfo*, i32, i8*, i8*, %struct.rpc_auth*, %struct.rpc_stat*, i32, i32, i32, %struct.rpc_rtt, %struct.msq_setbuf, %struct.rpc_wait_queue, i32, [32 x i8] }
+	%struct.rpc_cred = type { %struct.rpc_cred*, %struct.rpc_auth*, %struct.rpc_credops*, i32, %struct.IO_APIC_reg_00, i16, i32, i32 }
+	%struct.rpc_credops = type { void (%struct.rpc_cred*)*, i32 (%struct.rpc_cred*, i32)*, i32* (%struct.rpc_task*, i32*, i32)*, i32 (%struct.rpc_task*)*, i32* (%struct.rpc_task*, i32*)* }
+	%struct.rpc_message = type { i32, i8*, i8*, %struct.rpc_cred* }
+	%struct.rpc_procinfo = type { i8*, i32 (i8*, i32*, i8*)*, i32 (i8*, i32*, i8*)*, i32, i32, i32 }
+	%struct.rpc_program = type { i8*, i32, i32, %struct.rpc_version**, %struct.rpc_stat* }
+	%struct.rpc_rqst = type { %struct.rpc_xprt*, %struct.rpc_timeout, %struct.xdr_buf, %struct.xdr_buf, %struct.rpc_task*, i32, %struct.rpc_rqst*, i32, i32, %struct.list_head, %struct.xdr_buf, [2 x i32], i32, i32, i32, i32 }
+	%struct.rpc_rtt = type { i32, [5 x i32], [5 x i32], %struct.IO_APIC_reg_00 }
+	%struct.rpc_stat = type { %struct.rpc_program*, i32, i32, i32, i32, i32, i32, i32, i32, i32 }
+	%struct.rpc_task = type { %struct.list_head, i32, %struct.list_head, %struct.rpc_clnt*, %struct.rpc_rqst*, i32, %struct.rpc_wait_queue*, %struct.rpc_message, i32*, i8, i8, i8, void (%struct.rpc_task*)*, void (%struct.rpc_task*)*, void (%struct.rpc_task*)*, void (%struct.rpc_task*)*, void (%struct.rpc_task*)*, i8*, %struct.timer_list, %struct.__wait_queue_head, i32, i16, i8, i32, i16 }
+	%struct.rpc_timeout = type { i32, i32, i32, i32, i16, i8 }
+	%struct.rpc_version = type { i32, i32, %struct.rpc_procinfo* }
+	%struct.rpc_wait_queue = type { %struct.list_head, i8* }
+	%struct.rpc_xprt = type { %struct.socket*, %struct.sock*, %struct.rpc_timeout, %struct.sockaddr_in, i32, i32, i32, i32, i32, %struct.rpc_wait_queue, %struct.rpc_wait_queue, %struct.rpc_wait_queue, %struct.rpc_wait_queue, %struct.rpc_rqst*, [16 x %struct.rpc_rqst], i32, i8, i32, i32, i32, i32, i32, i32, %struct.IO_APIC_reg_00, %struct.IO_APIC_reg_00, %struct.rpc_task*, %struct.list_head, void (%struct.sock*, i32)*, void (%struct.sock*)*, void (%struct.sock*)*, %struct.__wait_queue_head }
+	%struct.rw_semaphore = type { i32, %struct.IO_APIC_reg_00, %struct.list_head }
+	%struct.scm_cookie = type { %struct.ViceFid, %struct.scm_fp_list*, i32 }
+	%struct.scm_fp_list = type { i32, [255 x %struct.file*] }
+	%struct.sem_array = type { %struct.kern_ipc_perm, i32, i32, %struct._drm_i810_overlay_t*, %struct.sem_queue*, %struct.sem_queue**, %struct.sem_undo*, i32 }
+	%struct.sem_queue = type { %struct.sem_queue*, %struct.sem_queue**, %struct.task_struct*, %struct.sem_undo*, i32, i32, %struct.sem_array*, i32, %struct.sembuf*, i32, i32 }
+	%struct.sem_undo = type { %struct.sem_undo*, %struct.sem_undo*, i32, i16* }
+	%struct.semaphore = type { %struct.IO_APIC_reg_00, i32, %struct.__wait_queue_head }
+	%struct.sembuf = type { i16, i16, i16 }
+	%struct.seq_file = type { i8*, i32, i32, i32, i64, %struct.semaphore, %struct.seq_operations*, i8* }
+	%struct.seq_operations = type { i8* (%struct.seq_file*, i64*)*, void (%struct.seq_file*, i8*)*, i8* (%struct.seq_file*, i8*, i64*)*, i32 (%struct.seq_file*, i8*)* }
+	%struct.shmem_inode_info = type { %struct.IO_APIC_reg_00, i32, [16 x %struct.IO_APIC_reg_00], i8**, i32, i32, %struct.list_head, %struct.inode* }
+	%struct.sigaction = type { void (i32)*, i32, void ()*, %typedef.__kernel_fsid_t }
+	%struct.siginfo = type { i32, i32, i32, { [29 x i32] } }
+	%struct.signal_struct = type { %struct.IO_APIC_reg_00, [64 x %struct.k_sigaction], %struct.IO_APIC_reg_00 }
+	%struct.sigpending = type { %struct.sigqueue*, %struct.sigqueue**, %typedef.__kernel_fsid_t }
 	%struct.sigqueue = type { %struct.sigqueue*, %struct.siginfo }
-	%struct.sk_buff = type { %struct.sk_buff*, %struct.sk_buff*, %struct.sk_buff_head*, %struct.sock*, %struct.autofs_packet_hdr, %struct.net_device*, %struct.net_device*, { ubyte* }, { ubyte* }, { ubyte* }, %struct.dst_entry*, [48 x sbyte], uint, uint, uint, ubyte, ubyte, ubyte, ubyte, uint, %struct.bluez_skb_cb, ushort, ushort, uint, ubyte*, ubyte*, ubyte*, ubyte*, void (%struct.sk_buff*)*, uint, uint, %struct.nf_ct_info*, uint }
-	%struct.sk_buff_head = type { %struct.sk_buff*, %struct.sk_buff*, uint, %struct.IO_APIC_reg_00 }
-	%struct.sock = type { uint, uint, ushort, ushort, int, %struct.sock*, %struct.sock**, %struct.sock*, %struct.sock**, ubyte, ubyte, ushort, ushort, ubyte, ubyte, %struct.bluez_skb_cb, %typedef.socket_lock_t, int, %struct.__wait_queue_head*, %struct.dst_entry*, %typedef.rwlock_t, %struct.bluez_skb_cb, %struct.sk_buff_head, %struct.bluez_skb_cb, %struct.sk_buff_head, %struct.bluez_skb_cb, int, int, uint, uint, int, %struct.sock*, sbyte, sbyte, sbyte, sbyte, sbyte, sbyte, sbyte, sbyte, sbyte, ubyte, ubyte, ubyte, ubyte, int, int, uint, int, %struct.sock*, { %struct.sk_buff*, %struct.sk_buff* }, %typedef.rwlock_t, %struct.sk_buff_head, %struct.proto*, { %struct.tcp_opt }, int, int, ushort, ushort, uint, ushort, ubyte, ubyte, %struct.ViceFid, int, int, int, { %struct.unix_opt }, %struct.timer_list, %struct.autofs_packet_hdr, %struct.socket*, sbyte*, void (%struct.sock*)*, void (%struct.sock*, int)*, void (%struct.sock*)*, void (%struct.sock*)*, int (%struct.sock*, %struct.sk_buff*)*, void (%struct.sock*)* }
-	%struct.sockaddr = type { ushort, [14 x sbyte] }
-	%struct.sockaddr_in = type { ushort, ushort, %struct.IO_APIC_reg_00, [8 x ubyte] }
-	%struct.sockaddr_un = type { ushort, [108 x sbyte] }
-	%struct.socket = type { uint, uint, %struct.proto_ops*, %struct.inode*, %struct.fasync_struct*, %struct.file*, %struct.sock*, %struct.__wait_queue_head, short, ubyte }
-	%struct.statfs = type { int, int, int, int, int, int, int, %typedef.__kernel_fsid_t, int, [6 x int] }
-	%struct.super_block = type { %struct.list_head, ushort, uint, ubyte, ubyte, ulong, %struct.file_system_type*, %struct.super_operations*, %struct.dquot_operations*, %struct.quotactl_ops*, uint, uint, %struct.dentry*, %struct.rw_semaphore, %struct.semaphore, int, %struct.bluez_skb_cb, %struct.list_head, %struct.list_head, %struct.list_head, %struct.block_device*, %struct.list_head, %struct.quota_info, { [115 x uint] }, %struct.semaphore, %struct.semaphore }
-	%struct.super_operations = type { %struct.inode* (%struct.super_block*)*, void (%struct.inode*)*, void (%struct.inode*)*, void (%struct.inode*, sbyte*)*, void (%struct.inode*)*, void (%struct.inode*, int)*, void (%struct.inode*)*, void (%struct.inode*)*, void (%struct.super_block*)*, void (%struct.super_block*)*, int (%struct.super_block*)*, void (%struct.super_block*)*, void (%struct.super_block*)*, int (%struct.super_block*, %struct.statfs*)*, int (%struct.super_block*, int*, sbyte*)*, void (%struct.inode*)*, void (%struct.super_block*)*, %struct.dentry* (%struct.super_block*, uint*, int, int, int)*, int (%struct.dentry*, uint*, int*, int)*, int (%struct.seq_file*, %struct.vfsmount*)* }
-	%struct.task_struct = type { int, uint, int, %struct.IO_APIC_reg_00, %struct.exec_domain*, int, uint, int, int, int, uint, %struct.mm_struct*, int, uint, uint, %struct.list_head, uint, %struct.task_struct*, %struct.task_struct*, %struct.mm_struct*, %struct.list_head, uint, uint, %struct.linux_binfmt*, int, int, int, uint, int, int, int, int, int, int, int, %struct.task_struct*, %struct.task_struct*, %struct.task_struct*, %struct.task_struct*, %struct.task_struct*, %struct.list_head, %struct.task_struct*, %struct.task_struct**, %struct.__wait_queue_head, %struct.completion*, uint, uint, uint, uint, uint, uint, uint, %struct.timer_list, %struct.audio_buf_info, uint, [32 x int], [32 x int], uint, uint, uint, uint, uint, uint, int, uint, uint, uint, uint, uint, uint, uint, uint, int, [32 x uint], uint, uint, uint, int, %struct.user_struct*, [11 x %struct._drm_i810_overlay_t], ushort, [16 x sbyte], int, int, %struct.tty_struct*, uint, %struct.sem_undo*, %struct.sem_queue*, %struct.thread_struct, %struct.fs_struct*, %struct.files_struct*, %struct.namespace*, %struct.IO_APIC_reg_00, %struct.signal_struct*, %typedef.sigset_t, %struct.sigpending, uint, uint, int (sbyte*)*, sbyte*, %typedef.sigset_t*, uint, uint, %struct.IO_APIC_reg_00, sbyte*, %struct.llva_sigcontext*, uint, %struct.task_struct*, uint, %typedef.llva_icontext_t, %typedef.llva_fp_state_t, uint*, int, sbyte* }
-	%struct.tasklet_struct = type { %struct.tasklet_struct*, uint, %struct.bluez_skb_cb, void (uint)*, uint }
-	%struct.tc_stats = type { ulong, uint, uint, uint, uint, uint, uint, uint, %struct.IO_APIC_reg_00* }
-	%struct.tcf_proto = type { %struct.tcf_proto*, sbyte*, int (%struct.sk_buff*, %struct.tcf_proto*, %struct._drm_i810_overlay_t*)*, uint, uint, uint, %struct.Qdisc*, sbyte*, %struct.tcf_proto_ops* }
-	%struct.tcf_proto_ops = type { %struct.tcf_proto_ops*, [16 x sbyte], int (%struct.sk_buff*, %struct.tcf_proto*, %struct._drm_i810_overlay_t*)*, int (%struct.tcf_proto*)*, void (%struct.tcf_proto*)*, uint (%struct.tcf_proto*, uint)*, void (%struct.tcf_proto*, uint)*, int (%struct.tcf_proto*, uint, uint, %struct._agp_version**, uint*)*, int (%struct.tcf_proto*, uint)*, void (%struct.tcf_proto*, %struct.tcf_walker*)*, int (%struct.tcf_proto*, uint, %struct.sk_buff*, %struct.tcmsg*)* }
-	%struct.tcf_walker = type { int, int, int, int (%struct.tcf_proto*, uint, %struct.tcf_walker*)* }
-	%struct.tcmsg = type { ubyte, ubyte, ushort, int, uint, uint, uint }
-	%struct.tcp_func = type { int (%struct.sk_buff*)*, void (%struct.sock*, %struct.tcphdr*, int, %struct.sk_buff*)*, int (%struct.sock*)*, int (%struct.sock*, %struct.sk_buff*)*, %struct.sock* (%struct.sock*, %struct.sk_buff*, %struct.open_request*, %struct.dst_entry*)*, int (%struct.sock*)*, ushort, int (%struct.sock*, int, int, sbyte*, int)*, int (%struct.sock*, int, int, sbyte*, int*)*, void (%struct.sock*, %struct.sockaddr*)*, int }
-	%struct.tcp_listen_opt = type { ubyte, int, int, int, uint, [512 x %struct.open_request*] }
-	%struct.tcp_opt = type { int, uint, uint, uint, uint, uint, uint, uint, { ubyte, ubyte, ubyte, ubyte, uint, uint, uint, ushort, ushort }, { %struct.sk_buff_head, %struct.task_struct*, %struct.iovec*, int, int }, uint, uint, uint, uint, ushort, ushort, ushort, ubyte, ubyte, ubyte, ubyte, ubyte, ubyte, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, ushort, ushort, uint, uint, uint, %struct.timer_list, %struct.timer_list, %struct.sk_buff_head, %struct.tcp_func*, %struct.sk_buff*, %struct.page*, uint, uint, uint, uint, uint, uint, sbyte, sbyte, sbyte, sbyte, ubyte, ubyte, ubyte, ubyte, uint, uint, uint, int, ushort, ubyte, ubyte, [1 x %struct._drm_i810_overlay_t], [4 x %struct._drm_i810_overlay_t], uint, uint, ubyte, ubyte, ushort, ubyte, ubyte, ushort, uint, uint, uint, uint, uint, uint, int, uint, ushort, ubyte, ubyte, uint, %typedef.rwlock_t, %struct.tcp_listen_opt*, %struct.open_request*, %struct.open_request*, int, uint, uint, int, int, uint, uint }
-	%struct.tcp_v4_open_req = type { uint, uint, %struct.ip_options* }
-	%struct.tcphdr = type { ushort, ushort, uint, uint, ushort, ushort, ushort, ushort }
-	%struct.termios = type { uint, uint, uint, uint, ubyte, [19 x ubyte] }
-	%struct.thread_struct = type { uint, uint, uint, uint, uint, [8 x uint], uint, uint, uint, %union.i387_union, %struct.vm86_struct*, uint, uint, uint, uint, int, [33 x uint] }
-	%struct.timer_list = type { %struct.list_head, uint, uint, void (uint)* }
-	%struct.tq_struct = type { %struct.list_head, uint, void (sbyte*)*, sbyte* }
-	%struct.tty_driver = type { int, sbyte*, sbyte*, int, short, short, short, short, short, %struct.termios, int, int*, %struct.proc_dir_entry*, %struct.tty_driver*, %struct.tty_struct**, %struct.termios**, %struct.termios**, sbyte*, int (%struct.tty_struct*, %struct.file*)*, void (%struct.tty_struct*, %struct.file*)*, int (%struct.tty_struct*, int, ubyte*, int)*, void (%struct.tty_struct*, ubyte)*, void (%struct.tty_struct*)*, int (%struct.tty_struct*)*, int (%struct.tty_struct*)*, int (%struct.tty_struct*, %struct.file*, uint, uint)*, void (%struct.tty_struct*, %struct.termios*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*, int)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*, int)*, void (%struct.tty_struct*, sbyte)*, int (sbyte*, sbyte**, int, int, int*, sbyte*)*, int (%struct.file*, sbyte*, uint, sbyte*)*, %struct.tty_driver*, %struct.tty_driver* }
-	%struct.tty_flip_buffer = type { %struct.tq_struct, %struct.semaphore, sbyte*, ubyte*, int, int, [1024 x ubyte], [1024 x sbyte], [4 x ubyte] }
-	%struct.tty_ldisc = type { int, sbyte*, int, int, int (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, int (%struct.tty_struct*)*, int (%struct.tty_struct*, %struct.file*, ubyte*, uint)*, int (%struct.tty_struct*, %struct.file*, ubyte*, uint)*, int (%struct.tty_struct*, %struct.file*, uint, uint)*, void (%struct.tty_struct*, %struct.termios*)*, uint (%struct.tty_struct*, %struct.file*, %struct.poll_table_struct*)*, void (%struct.tty_struct*, ubyte*, sbyte*, int)*, int (%struct.tty_struct*)*, void (%struct.tty_struct*)* }
-	%struct.tty_struct = type { int, %struct.tty_driver, %struct.tty_ldisc, %struct.termios*, %struct.termios*, int, int, ushort, uint, int, %struct.drm_clip_rect, ubyte, ubyte, %struct.tty_struct*, %struct.fasync_struct*, %struct.tty_flip_buffer, int, int, %struct.__wait_queue_head, %struct.__wait_queue_head, %struct.tq_struct, sbyte*, sbyte*, %struct.list_head, uint, ubyte, ushort, uint, int, [8 x uint], sbyte*, int, int, int, [128 x uint], int, uint, uint, %struct.semaphore, %struct.semaphore, %struct.IO_APIC_reg_00, %struct.tq_struct }
-	%struct.unix_address = type { %struct.bluez_skb_cb, int, uint, [0 x %struct.sockaddr_un] }
-	%struct.unix_opt = type { %struct.unix_address*, %struct.dentry*, %struct.vfsmount*, %struct.semaphore, %struct.sock*, %struct.sock**, %struct.sock*, %struct.bluez_skb_cb, %typedef.rwlock_t, %struct.__wait_queue_head }
+	%struct.sk_buff = type { %struct.sk_buff*, %struct.sk_buff*, %struct.sk_buff_head*, %struct.sock*, %struct._drm_i810_overlay_t, %struct.net_device*, %struct.net_device*, { i8* }, { i8* }, { i8* }, %struct.dst_entry*, [48 x i8], i32, i32, i32, i8, i8, i8, i8, i32, %struct.IO_APIC_reg_00, i16, i16, i32, i8*, i8*, i8*, i8*, void (%struct.sk_buff*)*, i32, i32, %struct.nf_ct_info*, i32 }
+	%struct.sk_buff_head = type { %struct.sk_buff*, %struct.sk_buff*, i32, %struct.IO_APIC_reg_00 }
+	%struct.sock = type { i32, i32, i16, i16, i32, %struct.sock*, %struct.sock**, %struct.sock*, %struct.sock**, i8, i8, i16, i16, i8, i8, %struct.IO_APIC_reg_00, %struct.semaphore, i32, %struct.__wait_queue_head*, %struct.dst_entry*, %typedef.rwlock_t, %struct.IO_APIC_reg_00, %struct.sk_buff_head, %struct.IO_APIC_reg_00, %struct.sk_buff_head, %struct.IO_APIC_reg_00, i32, i32, i32, i32, i32, %struct.sock*, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i32, i32, i32, i32, %struct.sock*, { %struct.sk_buff*, %struct.sk_buff* }, %typedef.rwlock_t, %struct.sk_buff_head, %struct.proto*, { %struct.tcp_opt }, i32, i32, i16, i16, i32, i16, i8, i8, %struct.ViceFid, i32, i32, i32, { %struct.unix_opt }, %struct.timer_list, %struct._drm_i810_overlay_t, %struct.socket*, i8*, void (%struct.sock*)*, void (%struct.sock*, i32)*, void (%struct.sock*)*, void (%struct.sock*)*, i32 (%struct.sock*, %struct.sk_buff*)*, void (%struct.sock*)* }
+	%struct.sockaddr = type { i16, [14 x i8] }
+	%struct.sockaddr_in = type { i16, i16, %struct.IO_APIC_reg_00, [8 x i8] }
+	%struct.sockaddr_un = type { i16, [108 x i8] }
+	%struct.socket = type { i32, i32, %struct.proto_ops*, %struct.inode*, %struct.fasync_struct*, %struct.file*, %struct.sock*, %struct.__wait_queue_head, i16, i8 }
+	%struct.statfs = type { i32, i32, i32, i32, i32, i32, i32, %typedef.__kernel_fsid_t, i32, [6 x i32] }
+	%struct.super_block = type { %struct.list_head, i16, i32, i8, i8, i64, %struct.file_system_type*, %struct.super_operations*, %struct.dquot_operations*, %struct.quotactl_ops*, i32, i32, %struct.dentry*, %struct.rw_semaphore, %struct.semaphore, i32, %struct.IO_APIC_reg_00, %struct.list_head, %struct.list_head, %struct.list_head, %struct.block_device*, %struct.list_head, %struct.quota_info, { [115 x i32] }, %struct.semaphore, %struct.semaphore }
+	%struct.super_operations = type { %struct.inode* (%struct.super_block*)*, void (%struct.inode*)*, void (%struct.inode*)*, void (%struct.inode*, i8*)*, void (%struct.inode*)*, void (%struct.inode*, i32)*, void (%struct.inode*)*, void (%struct.inode*)*, void (%struct.super_block*)*, void (%struct.super_block*)*, i32 (%struct.super_block*)*, void (%struct.super_block*)*, void (%struct.super_block*)*, i32 (%struct.super_block*, %struct.statfs*)*, i32 (%struct.super_block*, i32*, i8*)*, void (%struct.inode*)*, void (%struct.super_block*)*, %struct.dentry* (%struct.super_block*, i32*, i32, i32, i32)*, i32 (%struct.dentry*, i32*, i32*, i32)*, i32 (%struct.seq_file*, %struct.vfsmount*)* }
+	%struct.task_struct = type { i32, i32, i32, %struct.IO_APIC_reg_00, %struct.exec_domain*, i32, i32, i32, i32, i32, i32, %struct.mm_struct*, i32, i32, i32, %struct.list_head, i32, %struct.task_struct*, %struct.task_struct*, %struct.mm_struct*, %struct.list_head, i32, i32, %struct.linux_binfmt*, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, %struct.task_struct*, %struct.task_struct*, %struct.task_struct*, %struct.task_struct*, %struct.task_struct*, %struct.list_head, %struct.task_struct*, %struct.task_struct**, %struct.__wait_queue_head, %struct.completion*, i32, i32, i32, i32, i32, i32, i32, %struct.timer_list, %struct.audio_buf_info, i32, [32 x i32], [32 x i32], i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, [32 x i32], i32, i32, i32, i32, %struct.user_struct*, [11 x %struct._drm_i810_overlay_t], i16, [16 x i8], i32, i32, %struct.tty_struct*, i32, %struct.sem_undo*, %struct.sem_queue*, %struct.thread_struct, %struct.fs_struct*, %struct.files_struct*, %struct.namespace*, %struct.IO_APIC_reg_00, %struct.signal_struct*, %typedef.__kernel_fsid_t, %struct.sigpending, i32, i32, i32 (i8*)*, i8*, %typedef.__kernel_fsid_t*, i32, i32, %struct.IO_APIC_reg_00, i8*, %struct.llva_sigcontext*, i32, %struct.task_struct*, i32, %typedef.llva_icontext_t, %typedef.llva_fp_state_t, i32*, i32, i8* }
+	%struct.tasklet_struct = type { %struct.tasklet_struct*, i32, %struct.IO_APIC_reg_00, void (i32)*, i32 }
+	%struct.tc_stats = type { i64, i32, i32, i32, i32, i32, i32, i32, %struct.IO_APIC_reg_00* }
+	%struct.tcf_proto = type { %struct.tcf_proto*, i8*, i32 (%struct.sk_buff*, %struct.tcf_proto*, %struct._drm_i810_overlay_t*)*, i32, i32, i32, %struct.Qdisc*, i8*, %struct.tcf_proto_ops* }
+	%struct.tcf_proto_ops = type { %struct.tcf_proto_ops*, [16 x i8], i32 (%struct.sk_buff*, %struct.tcf_proto*, %struct._drm_i810_overlay_t*)*, i32 (%struct.tcf_proto*)*, void (%struct.tcf_proto*)*, i32 (%struct.tcf_proto*, i32)*, void (%struct.tcf_proto*, i32)*, i32 (%struct.tcf_proto*, i32, i32, %struct._agp_version**, i32*)*, i32 (%struct.tcf_proto*, i32)*, void (%struct.tcf_proto*, %struct.tcf_walker*)*, i32 (%struct.tcf_proto*, i32, %struct.sk_buff*, %struct.tcmsg*)* }
+	%struct.tcf_walker = type { i32, i32, i32, i32 (%struct.tcf_proto*, i32, %struct.tcf_walker*)* }
+	%struct.tcmsg = type { i8, i8, i16, i32, i32, i32, i32 }
+	%struct.tcp_func = type { i32 (%struct.sk_buff*)*, void (%struct.sock*, %struct.tcphdr*, i32, %struct.sk_buff*)*, i32 (%struct.sock*)*, i32 (%struct.sock*, %struct.sk_buff*)*, %struct.sock* (%struct.sock*, %struct.sk_buff*, %struct.open_request*, %struct.dst_entry*)*, i32 (%struct.sock*)*, i16, i32 (%struct.sock*, i32, i32, i8*, i32)*, i32 (%struct.sock*, i32, i32, i8*, i32*)*, void (%struct.sock*, %struct.sockaddr*)*, i32 }
+	%struct.tcp_listen_opt = type { i8, i32, i32, i32, i32, [512 x %struct.open_request*] }
+	%struct.tcp_opt = type { i32, i32, i32, i32, i32, i32, i32, i32, { i8, i8, i8, i8, i32, i32, i32, i16, i16 }, { %struct.sk_buff_head, %struct.task_struct*, %struct.iovec*, i32, i32 }, i32, i32, i32, i32, i16, i16, i16, i8, i8, i8, i8, i8, i8, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i16, i16, i32, i32, i32, %struct.timer_list, %struct.timer_list, %struct.sk_buff_head, %struct.tcp_func*, %struct.sk_buff*, %struct.page*, i32, i32, i32, i32, i32, i32, i8, i8, i8, i8, i8, i8, i8, i8, i32, i32, i32, i32, i16, i8, i8, [1 x %struct._drm_i810_overlay_t], [4 x %struct._drm_i810_overlay_t], i32, i32, i8, i8, i16, i8, i8, i16, i32, i32, i32, i32, i32, i32, i32, i32, i16, i8, i8, i32, %typedef.rwlock_t, %struct.tcp_listen_opt*, %struct.open_request*, %struct.open_request*, i32, i32, i32, i32, i32, i32, i32 }
+	%struct.tcp_v4_open_req = type { i32, i32, %struct.ip_options* }
+	%struct.tcphdr = type { i16, i16, i32, i32, i16, i16, i16, i16 }
+	%struct.termios = type { i32, i32, i32, i32, i8, [19 x i8] }
+	%struct.thread_struct = type { i32, i32, i32, i32, i32, [8 x i32], i32, i32, i32, %union.i387_union, %struct.vm86_struct*, i32, i32, i32, i32, i32, [33 x i32] }
+	%struct.timer_list = type { %struct.list_head, i32, i32, void (i32)* }
+	%struct.tq_struct = type { %struct.list_head, i32, void (i8*)*, i8* }
+	%struct.tty_driver = type { i32, i8*, i8*, i32, i16, i16, i16, i16, i16, %struct.termios, i32, i32*, %struct.proc_dir_entry*, %struct.tty_driver*, %struct.tty_struct**, %struct.termios**, %struct.termios**, i8*, i32 (%struct.tty_struct*, %struct.file*)*, void (%struct.tty_struct*, %struct.file*)*, i32 (%struct.tty_struct*, i32, i8*, i32)*, void (%struct.tty_struct*, i8)*, void (%struct.tty_struct*)*, i32 (%struct.tty_struct*)*, i32 (%struct.tty_struct*)*, i32 (%struct.tty_struct*, %struct.file*, i32, i32)*, void (%struct.tty_struct*, %struct.termios*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*, i32)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*, i32)*, void (%struct.tty_struct*, i8)*, i32 (i8*, i8**, i32, i32, i32*, i8*)*, i32 (%struct.file*, i8*, i32, i8*)*, %struct.tty_driver*, %struct.tty_driver* }
+	%struct.tty_flip_buffer = type { %struct.tq_struct, %struct.semaphore, i8*, i8*, i32, i32, [1024 x i8], [1024 x i8], [4 x i8] }
+	%struct.tty_ldisc = type { i32, i8*, i32, i32, i32 (%struct.tty_struct*)*, void (%struct.tty_struct*)*, void (%struct.tty_struct*)*, i32 (%struct.tty_struct*)*, i32 (%struct.tty_struct*, %struct.file*, i8*, i32)*, i32 (%struct.tty_struct*, %struct.file*, i8*, i32)*, i32 (%struct.tty_struct*, %struct.file*, i32, i32)*, void (%struct.tty_struct*, %struct.termios*)*, i32 (%struct.tty_struct*, %struct.file*, %struct.poll_table_struct*)*, void (%struct.tty_struct*, i8*, i8*, i32)*, i32 (%struct.tty_struct*)*, void (%struct.tty_struct*)* }
+	%struct.tty_struct = type { i32, %struct.tty_driver, %struct.tty_ldisc, %struct.termios*, %struct.termios*, i32, i32, i16, i32, i32, %struct.drm_clip_rect, i8, i8, %struct.tty_struct*, %struct.fasync_struct*, %struct.tty_flip_buffer, i32, i32, %struct.__wait_queue_head, %struct.__wait_queue_head, %struct.tq_struct, i8*, i8*, %struct.list_head, i32, i8, i16, i32, i32, [8 x i32], i8*, i32, i32, i32, [128 x i32], i32, i32, i32, %struct.semaphore, %struct.semaphore, %struct.IO_APIC_reg_00, %struct.tq_struct }
+	%struct.unix_address = type { %struct.IO_APIC_reg_00, i32, i32, [0 x %struct.sockaddr_un] }
+	%struct.unix_opt = type { %struct.unix_address*, %struct.dentry*, %struct.vfsmount*, %struct.semaphore, %struct.sock*, %struct.sock**, %struct.sock*, %struct.IO_APIC_reg_00, %typedef.rwlock_t, %struct.__wait_queue_head }
 	%struct.usb_bus = type opaque
 	%struct.usbdev_inode_info = type { %struct.list_head, %struct.list_head, { %struct.usb_bus* } }
-	%struct.user_struct = type { %struct.bluez_skb_cb, %struct.bluez_skb_cb, %struct.bluez_skb_cb, %struct.user_struct*, %struct.user_struct**, uint }
-	%struct.vfsmount = type { %struct.list_head, %struct.vfsmount*, %struct.dentry*, %struct.dentry*, %struct.super_block*, %struct.list_head, %struct.list_head, %struct.bluez_skb_cb, int, sbyte*, %struct.list_head }
+	%struct.user_struct = type { %struct.IO_APIC_reg_00, %struct.IO_APIC_reg_00, %struct.IO_APIC_reg_00, %struct.user_struct*, %struct.user_struct**, i32 }
+	%struct.vfsmount = type { %struct.list_head, %struct.vfsmount*, %struct.dentry*, %struct.dentry*, %struct.super_block*, %struct.list_head, %struct.list_head, %struct.IO_APIC_reg_00, i32, i8*, %struct.list_head }
 	%struct.vlan_group = type opaque
-	%struct.vm86_regs = type { int, int, int, int, int, int, int, int, int, int, int, int, int, ushort, ushort, int, int, ushort, ushort, ushort, ushort, ushort, ushort, ushort, ushort, ushort, ushort }
-	%struct.vm86_struct = type { %struct.vm86_regs, uint, uint, uint, %struct.revectored_struct, %struct.revectored_struct }
-	%struct.vm_area_struct = type { %struct.mm_struct*, uint, uint, %struct.vm_area_struct*, %struct.IO_APIC_reg_00, uint, %struct.rb_node_s, %struct.vm_area_struct*, %struct.vm_area_struct**, %struct.vm_operations_struct*, uint, %struct.file*, uint, sbyte* }
-	%struct.vm_operations_struct = type { void (%struct.vm_area_struct*)*, void (%struct.vm_area_struct*)*, %struct.page* (%struct.vm_area_struct*, uint, int)* }
-	%struct.xdr_buf = type { [1 x %struct.iovec], [1 x %struct.iovec], %struct.page**, uint, uint, uint }
-	%typedef.__kernel_fd_set = type { [32 x int] }
-	%typedef.__kernel_fsid_t = type { [2 x int] }
-	%typedef.dvd_authinfo = type { [2 x ulong] }
-	%typedef.llva_fp_state_t = type { [7 x uint], [20 x uint] }
-	%typedef.llva_icontext_t = type { uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint, uint*, uint }
-	%typedef.rwlock_t = type { %struct.IO_APIC_reg_00, %struct.IO_APIC_reg_00, uint }
-	%typedef.sigset_t = type { [2 x uint] }
-	%typedef.socket_lock_t = type { %struct.IO_APIC_reg_00, uint, %struct.__wait_queue_head }
+	%struct.vm86_regs = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i16, i16, i32, i32, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16 }
+	%struct.vm86_struct = type { %struct.vm86_regs, i32, i32, i32, %struct.revectored_struct, %struct.revectored_struct }
+	%struct.vm_area_struct = type { %struct.mm_struct*, i32, i32, %struct.vm_area_struct*, %struct.IO_APIC_reg_00, i32, %struct.rb_node_s, %struct.vm_area_struct*, %struct.vm_area_struct**, %struct.vm_operations_struct*, i32, %struct.file*, i32, i8* }
+	%struct.vm_operations_struct = type { void (%struct.vm_area_struct*)*, void (%struct.vm_area_struct*)*, %struct.page* (%struct.vm_area_struct*, i32, i32)* }
+	%struct.xdr_buf = type { [1 x %struct.iovec], [1 x %struct.iovec], %struct.page**, i32, i32, i32 }
+	%typedef.__kernel_fd_set = type { [32 x i32] }
+	%typedef.__kernel_fsid_t = type { [2 x i32] }
+	%typedef.dvd_authinfo = type { [2 x i64] }
+	%typedef.llva_fp_state_t = type { [7 x i32], [20 x i32] }
+	%typedef.llva_icontext_t = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32*, i32 }
+	%typedef.rwlock_t = type { %struct.IO_APIC_reg_00, %struct.IO_APIC_reg_00, i32 }
+	%typedef.sigset_t = type { [2 x i32] }
+	%typedef.socket_lock_t = type { %struct.IO_APIC_reg_00, i32, %struct.__wait_queue_head }
 	%union.i387_union = type { %struct.i387_fxsave_struct }
 
-implementation   ; Functions:
-
-void %rs_init() {
+define void @rs_init() {
 entry:
-	br bool false, label %loopentry.0.no_exit.0_crit_edge, label %loopentry.0.loopexit.0_crit_edge
+	br i1 false, label %loopentry.0.no_exit.0_crit_edge, label %loopentry.0.loopexit.0_crit_edge
 
 loopentry.0:		; No predecessors!
 	unreachable
@@ -230,7 +227,7 @@ loopentry.0.no_exit.0_crit_edge:		; preds = %entry
 	br label %no_exit.0
 
 no_exit.0:		; preds = %no_exit.0.no_exit.0_crit_edge, %loopentry.0.no_exit.0_crit_edge
-	br bool false, label %no_exit.0.no_exit.0_crit_edge, label %no_exit.0.loopexit.0_crit_edge
+	br i1 false, label %no_exit.0.no_exit.0_crit_edge, label %no_exit.0.loopexit.0_crit_edge
 
 no_exit.0.loopexit.0_crit_edge:		; preds = %no_exit.0
 	br label %loopexit.0
@@ -239,13 +236,13 @@ no_exit.0.no_exit.0_crit_edge:		; preds = %no_exit.0
 	br label %no_exit.0
 
 loopexit.0:		; preds = %no_exit.0.loopexit.0_crit_edge, %loopentry.0.loopexit.0_crit_edge
-	br bool false, label %then.0, label %loopexit.0.endif.0_crit_edge
+	br i1 false, label %then.0, label %loopexit.0.endif.0_crit_edge
 
 loopexit.0.endif.0_crit_edge:		; preds = %loopexit.0
 	br label %endif.0
 
 then.0:		; preds = %loopexit.0
-	br bool false, label %loopentry.1.no_exit.1_crit_edge, label %loopentry.1.loopexit.1_crit_edge
+	br i1 false, label %loopentry.1.no_exit.1_crit_edge, label %loopentry.1.loopexit.1_crit_edge
 
 loopentry.1:		; No predecessors!
 	unreachable
@@ -257,7 +254,7 @@ loopentry.1.no_exit.1_crit_edge:		; preds = %then.0
 	br label %no_exit.1
 
 no_exit.1:		; preds = %no_exit.1.backedge, %loopentry.1.no_exit.1_crit_edge
-	br bool false, label %shortcirc_next.0, label %no_exit.1.shortcirc_done.0_crit_edge
+	br i1 false, label %shortcirc_next.0, label %no_exit.1.shortcirc_done.0_crit_edge
 
 no_exit.1.shortcirc_done.0_crit_edge:		; preds = %no_exit.1
 	br label %shortcirc_done.0
@@ -266,10 +263,10 @@ shortcirc_next.0:		; preds = %no_exit.1
 	br label %shortcirc_done.0
 
 shortcirc_done.0:		; preds = %shortcirc_next.0, %no_exit.1.shortcirc_done.0_crit_edge
-	br bool false, label %then.1, label %endif.1
+	br i1 false, label %then.1, label %endif.1
 
 then.1:		; preds = %shortcirc_done.0
-	br bool false, label %then.1.no_exit.1_crit_edge, label %then.1.loopexit.1_crit_edge
+	br i1 false, label %then.1.no_exit.1_crit_edge, label %then.1.loopexit.1_crit_edge
 
 then.1.loopexit.1_crit_edge:		; preds = %then.1
 	br label %loopexit.1
@@ -281,7 +278,7 @@ no_exit.1.backedge:		; preds = %endif.1.no_exit.1_crit_edge, %then.1.no_exit.1_c
 	br label %no_exit.1
 
 endif.1:		; preds = %shortcirc_done.0
-	br bool false, label %endif.1.no_exit.1_crit_edge, label %endif.1.loopexit.1_crit_edge
+	br i1 false, label %endif.1.no_exit.1_crit_edge, label %endif.1.loopexit.1_crit_edge
 
 endif.1.loopexit.1_crit_edge:		; preds = %endif.1
 	br label %loopexit.1
@@ -293,7 +290,7 @@ loopexit.1:		; preds = %endif.1.loopexit.1_crit_edge, %then.1.loopexit.1_crit_ed
 	br label %endif.0
 
 endif.0:		; preds = %loopexit.1, %loopexit.0.endif.0_crit_edge
-	br bool false, label %then.2, label %endif.0.endif.2_crit_edge
+	br i1 false, label %then.2, label %endif.0.endif.2_crit_edge
 
 endif.0.endif.2_crit_edge:		; preds = %endif.0
 	br label %endif.2
@@ -305,7 +302,7 @@ dead_block.0:		; No predecessors!
 	br label %endif.2
 
 endif.2:		; preds = %dead_block.0, %endif.0.endif.2_crit_edge
-	br bool false, label %then.3, label %endif.2.endif.3_crit_edge
+	br i1 false, label %then.3, label %endif.2.endif.3_crit_edge
 
 endif.2.endif.3_crit_edge:		; preds = %endif.2
 	br label %endif.3
@@ -320,7 +317,7 @@ endif.3:		; preds = %dead_block.1, %endif.2.endif.3_crit_edge
 	br label %loopentry.2
 
 loopentry.2:		; preds = %endif.6, %endif.3
-	br bool false, label %loopentry.2.no_exit.2_crit_edge, label %loopentry.2.loopexit.2_crit_edge
+	br i1 false, label %loopentry.2.no_exit.2_crit_edge, label %loopentry.2.loopexit.2_crit_edge
 
 loopentry.2.loopexit.2_crit_edge:		; preds = %loopentry.2
 	br label %loopexit.2
@@ -329,7 +326,7 @@ loopentry.2.no_exit.2_crit_edge:		; preds = %loopentry.2
 	br label %no_exit.2
 
 no_exit.2:		; preds = %then.5.no_exit.2_crit_edge, %loopentry.2.no_exit.2_crit_edge
-	br bool false, label %then.4, label %no_exit.2.endif.4_crit_edge
+	br i1 false, label %then.4, label %no_exit.2.endif.4_crit_edge
 
 no_exit.2.endif.4_crit_edge:		; preds = %no_exit.2
 	br label %endif.4
@@ -338,13 +335,13 @@ then.4:		; preds = %no_exit.2
 	br label %endif.4
 
 endif.4:		; preds = %then.4, %no_exit.2.endif.4_crit_edge
-	br bool false, label %shortcirc_next.1, label %endif.4.shortcirc_done.1_crit_edge
+	br i1 false, label %shortcirc_next.1, label %endif.4.shortcirc_done.1_crit_edge
 
 endif.4.shortcirc_done.1_crit_edge:		; preds = %endif.4
 	br label %shortcirc_done.1
 
 shortcirc_next.1:		; preds = %endif.4
-	br bool false, label %then.i21, label %endif.i
+	br i1 false, label %then.i21, label %endif.i
 
 then.i21:		; preds = %shortcirc_next.1
 	br label %then.5
@@ -362,7 +359,7 @@ __check_region.exit:		; No predecessors!
 	unreachable
 
 shortcirc_done.1:		; preds = %endif.i, %endif.4.shortcirc_done.1_crit_edge
-	br bool false, label %shortcirc_done.1.then.5_crit_edge, label %shortcirc_done.1.endif.5_crit_edge
+	br i1 false, label %shortcirc_done.1.then.5_crit_edge, label %shortcirc_done.1.endif.5_crit_edge
 
 shortcirc_done.1.endif.5_crit_edge:		; preds = %shortcirc_done.1
 	br label %endif.5
@@ -371,7 +368,7 @@ shortcirc_done.1.then.5_crit_edge:		; preds = %shortcirc_done.1
 	br label %then.5
 
 then.5:		; preds = %shortcirc_done.1.then.5_crit_edge, %then.i21
-	br bool false, label %then.5.no_exit.2_crit_edge, label %then.5.loopexit.2_crit_edge
+	br i1 false, label %then.5.no_exit.2_crit_edge, label %then.5.loopexit.2_crit_edge
 
 then.5.loopexit.2_crit_edge:		; preds = %then.5
 	br label %loopexit.2
@@ -383,7 +380,7 @@ dead_block_after_continue.0:		; No predecessors!
 	unreachable
 
 endif.5:		; preds = %shortcirc_done.1.endif.5_crit_edge
-	br bool false, label %then.6, label %endif.5.endif.6_crit_edge
+	br i1 false, label %then.6, label %endif.5.endif.6_crit_edge
 
 endif.5.endif.6_crit_edge:		; preds = %endif.5
 	br label %endif.6
@@ -401,7 +398,7 @@ loopexit.2:		; preds = %then.5.loopexit.2_crit_edge, %loopentry.2.loopexit.2_cri
 	br label %loopentry.3
 
 loopentry.3:		; preds = %endif.9, %loopexit.2
-	br bool false, label %loopentry.3.no_exit.3_crit_edge, label %loopentry.3.loopexit.3_crit_edge
+	br i1 false, label %loopentry.3.no_exit.3_crit_edge, label %loopentry.3.loopexit.3_crit_edge
 
 loopentry.3.loopexit.3_crit_edge:		; preds = %loopentry.3
 	br label %loopexit.3
@@ -410,13 +407,13 @@ loopentry.3.no_exit.3_crit_edge:		; preds = %loopentry.3
 	br label %no_exit.3
 
 no_exit.3:		; preds = %then.7.no_exit.3_crit_edge, %loopentry.3.no_exit.3_crit_edge
-	br bool false, label %then.7, label %no_exit.3.endif.7_crit_edge
+	br i1 false, label %then.7, label %no_exit.3.endif.7_crit_edge
 
 no_exit.3.endif.7_crit_edge:		; preds = %no_exit.3
 	br label %endif.7
 
 then.7:		; preds = %no_exit.3
-	br bool false, label %then.7.no_exit.3_crit_edge, label %then.7.loopexit.3_crit_edge
+	br i1 false, label %then.7.no_exit.3_crit_edge, label %then.7.loopexit.3_crit_edge
 
 then.7.loopexit.3_crit_edge:		; preds = %then.7
 	br label %loopexit.3
@@ -428,7 +425,7 @@ dead_block_after_continue.1:		; No predecessors!
 	unreachable
 
 endif.7:		; preds = %no_exit.3.endif.7_crit_edge
-	br bool false, label %shortcirc_next.2, label %endif.7.shortcirc_done.2_crit_edge
+	br i1 false, label %shortcirc_next.2, label %endif.7.shortcirc_done.2_crit_edge
 
 endif.7.shortcirc_done.2_crit_edge:		; preds = %endif.7
 	br label %shortcirc_done.2
@@ -437,13 +434,13 @@ shortcirc_next.2:		; preds = %endif.7
 	br label %shortcirc_done.2
 
 shortcirc_done.2:		; preds = %shortcirc_next.2, %endif.7.shortcirc_done.2_crit_edge
-	br bool false, label %shortcirc_next.3, label %shortcirc_done.2.shortcirc_done.3_crit_edge
+	br i1 false, label %shortcirc_next.3, label %shortcirc_done.2.shortcirc_done.3_crit_edge
 
 shortcirc_done.2.shortcirc_done.3_crit_edge:		; preds = %shortcirc_done.2
 	br label %shortcirc_done.3
 
 shortcirc_next.3:		; preds = %shortcirc_done.2
-	br bool false, label %shortcirc_next.3.shortcirc_done.4_crit_edge, label %shortcirc_next.4
+	br i1 false, label %shortcirc_next.3.shortcirc_done.4_crit_edge, label %shortcirc_next.4
 
 shortcirc_next.3.shortcirc_done.4_crit_edge:		; preds = %shortcirc_next.3
 	br label %shortcirc_done.4
@@ -455,7 +452,7 @@ shortcirc_done.4:		; preds = %shortcirc_next.4, %shortcirc_next.3.shortcirc_done
 	br label %shortcirc_done.3
 
 shortcirc_done.3:		; preds = %shortcirc_done.4, %shortcirc_done.2.shortcirc_done.3_crit_edge
-	br bool false, label %then.8, label %shortcirc_done.3.endif.8_crit_edge
+	br i1 false, label %then.8, label %shortcirc_done.3.endif.8_crit_edge
 
 shortcirc_done.3.endif.8_crit_edge:		; preds = %shortcirc_done.3
 	br label %endif.8
@@ -464,10 +461,10 @@ then.8:		; preds = %shortcirc_done.3
 	br label %endif.8
 
 endif.8:		; preds = %then.8, %shortcirc_done.3.endif.8_crit_edge
-	br bool false, label %then.9, label %else
+	br i1 false, label %then.9, label %else
 
 then.9:		; preds = %endif.8
-	br bool false, label %cond_true.0, label %cond_false.0
+	br i1 false, label %cond_true.0, label %cond_false.0
 
 cond_true.0:		; preds = %then.9
 	br label %cond_continue.0
@@ -479,7 +476,7 @@ cond_continue.0:		; preds = %cond_false.0, %cond_true.0
 	br label %endif.9
 
 else:		; preds = %endif.8
-	br bool false, label %cond_true.1, label %cond_false.1
+	br i1 false, label %cond_true.1, label %cond_false.1
 
 cond_true.1:		; preds = %else
 	br label %cond_continue.1
@@ -497,7 +494,7 @@ loopcont.3:		; No predecessors!
 	unreachable
 
 loopexit.3:		; preds = %then.7.loopexit.3_crit_edge, %loopentry.3.loopexit.3_crit_edge
-	br bool false, label %loopentry.i.i.i2.no_exit.i.i.i4_crit_edge, label %loopentry.i.i.i2.pci_register_driver.exit.i.i_crit_edge
+	br i1 false, label %loopentry.i.i.i2.no_exit.i.i.i4_crit_edge, label %loopentry.i.i.i2.pci_register_driver.exit.i.i_crit_edge
 
 loopentry.i.i.i2:		; No predecessors!
 	unreachable
@@ -509,22 +506,22 @@ loopentry.i.i.i2.no_exit.i.i.i4_crit_edge:		; preds = %loopexit.3
 	br label %no_exit.i.i.i4
 
 no_exit.i.i.i4:		; preds = %endif.i.i.i10.no_exit.i.i.i4_crit_edge, %loopentry.i.i.i2.no_exit.i.i.i4_crit_edge
-	br bool false, label %then.i.i.i6, label %no_exit.i.i.i4.endif.i.i.i10_crit_edge
+	br i1 false, label %then.i.i.i6, label %no_exit.i.i.i4.endif.i.i.i10_crit_edge
 
 no_exit.i.i.i4.endif.i.i.i10_crit_edge:		; preds = %no_exit.i.i.i4
 	br label %endif.i.i.i10
 
 then.i.i.i6:		; preds = %no_exit.i.i.i4
-	br bool false, label %then.0.i.i.i.i, label %else.i.i.i.i
+	br i1 false, label %then.0.i.i.i.i, label %else.i.i.i.i
 
 then.0.i.i.i.i:		; preds = %then.i.i.i6
-	br bool false, label %then.1.i.i.i.i, label %endif.1.i.i.i.i
+	br i1 false, label %then.1.i.i.i.i, label %endif.1.i.i.i.i
 
 then.1.i.i.i.i:		; preds = %then.0.i.i.i.i
 	br label %endif.i.i.i10
 
 endif.1.i.i.i.i:		; preds = %then.0.i.i.i.i
-	br bool false, label %endif.1.i.i.i.i.then.i.i.i.i.i.i_crit_edge, label %endif.1.i.i.i.i.endif.i.i.i.i.i.i_crit_edge
+	br i1 false, label %endif.1.i.i.i.i.then.i.i.i.i.i.i_crit_edge, label %endif.1.i.i.i.i.endif.i.i.i.i.i.i_crit_edge
 
 endif.1.i.i.i.i.endif.i.i.i.i.i.i_crit_edge:		; preds = %endif.1.i.i.i.i
 	br label %endif.i.i.i.i.i.i
@@ -533,7 +530,7 @@ endif.1.i.i.i.i.then.i.i.i.i.i.i_crit_edge:		; preds = %endif.1.i.i.i.i
 	br label %then.i.i.i.i.i.i
 
 else.i.i.i.i:		; preds = %then.i.i.i6
-	br bool false, label %endif.0.i.i.i.i.then.i.i.i.i.i.i_crit_edge, label %endif.0.i.i.i.i.endif.i.i.i.i.i.i_crit_edge
+	br i1 false, label %endif.0.i.i.i.i.then.i.i.i.i.i.i_crit_edge, label %endif.0.i.i.i.i.endif.i.i.i.i.i.i_crit_edge
 
 endif.0.i.i.i.i:		; No predecessors!
 	unreachable
@@ -545,7 +542,7 @@ endif.0.i.i.i.i.then.i.i.i.i.i.i_crit_edge:		; preds = %else.i.i.i.i
 	br label %then.i.i.i.i.i.i
 
 then.i.i.i.i.i.i:		; preds = %endif.0.i.i.i.i.then.i.i.i.i.i.i_crit_edge, %endif.1.i.i.i.i.then.i.i.i.i.i.i_crit_edge
-	br bool false, label %then.i.i.i.i.i.i.then.2.i.i.i.i_crit_edge, label %then.i.i.i.i.i.i.endif.2.i.i.i.i_crit_edge
+	br i1 false, label %then.i.i.i.i.i.i.then.2.i.i.i.i_crit_edge, label %then.i.i.i.i.i.i.endif.2.i.i.i.i_crit_edge
 
 then.i.i.i.i.i.i.endif.2.i.i.i.i_crit_edge:		; preds = %then.i.i.i.i.i.i
 	br label %endif.2.i.i.i.i
@@ -554,7 +551,7 @@ then.i.i.i.i.i.i.then.2.i.i.i.i_crit_edge:		; preds = %then.i.i.i.i.i.i
 	br label %then.2.i.i.i.i
 
 endif.i.i.i.i.i.i:		; preds = %endif.0.i.i.i.i.endif.i.i.i.i.i.i_crit_edge, %endif.1.i.i.i.i.endif.i.i.i.i.i.i_crit_edge
-	br bool false, label %dev_probe_lock.exit.i.i.i.i.then.2.i.i.i.i_crit_edge, label %dev_probe_lock.exit.i.i.i.i.endif.2.i.i.i.i_crit_edge
+	br i1 false, label %dev_probe_lock.exit.i.i.i.i.then.2.i.i.i.i_crit_edge, label %dev_probe_lock.exit.i.i.i.i.endif.2.i.i.i.i_crit_edge
 
 dev_probe_lock.exit.i.i.i.i:		; No predecessors!
 	unreachable
@@ -569,7 +566,7 @@ then.2.i.i.i.i:		; preds = %dev_probe_lock.exit.i.i.i.i.then.2.i.i.i.i_crit_edge
 	br label %endif.2.i.i.i.i
 
 endif.2.i.i.i.i:		; preds = %then.2.i.i.i.i, %dev_probe_lock.exit.i.i.i.i.endif.2.i.i.i.i_crit_edge, %then.i.i.i.i.i.i.endif.2.i.i.i.i_crit_edge
-	br bool false, label %then.i.i2.i.i.i.i, label %endif.i.i3.i.i.i.i
+	br i1 false, label %then.i.i2.i.i.i.i, label %endif.i.i3.i.i.i.i
 
 then.i.i2.i.i.i.i:		; preds = %endif.2.i.i.i.i
 	br label %endif.i.i.i10
@@ -584,7 +581,7 @@ pci_announce_device.exit.i.i.i:		; No predecessors!
 	unreachable
 
 endif.i.i.i10:		; preds = %endif.i.i3.i.i.i.i, %then.i.i2.i.i.i.i, %then.1.i.i.i.i, %no_exit.i.i.i4.endif.i.i.i10_crit_edge
-	br bool false, label %endif.i.i.i10.no_exit.i.i.i4_crit_edge, label %endif.i.i.i10.pci_register_driver.exit.i.i_crit_edge
+	br i1 false, label %endif.i.i.i10.no_exit.i.i.i4_crit_edge, label %endif.i.i.i10.pci_register_driver.exit.i.i_crit_edge
 
 endif.i.i.i10.pci_register_driver.exit.i.i_crit_edge:		; preds = %endif.i.i.i10
 	br label %pci_register_driver.exit.i.i
@@ -593,7 +590,7 @@ endif.i.i.i10.no_exit.i.i.i4_crit_edge:		; preds = %endif.i.i.i10
 	br label %no_exit.i.i.i4
 
 pci_register_driver.exit.i.i:		; preds = %endif.i.i.i10.pci_register_driver.exit.i.i_crit_edge, %loopentry.i.i.i2.pci_register_driver.exit.i.i_crit_edge
-	br bool false, label %then.0.i.i12, label %endif.0.i.i13
+	br i1 false, label %then.0.i.i12, label %endif.0.i.i13
 
 then.0.i.i12:		; preds = %pci_register_driver.exit.i.i
 	br label %probe_serial_pci.exit
@@ -605,7 +602,7 @@ then.0.i.i12.then.i_crit_edge:		; No predecessors!
 	br label %then.i
 
 endif.0.i.i13:		; preds = %pci_register_driver.exit.i.i
-	br bool false, label %then.1.i.i14, label %endif.0.i.i13.endif.1.i.i15_crit_edge
+	br i1 false, label %then.1.i.i14, label %endif.0.i.i13.endif.1.i.i15_crit_edge
 
 endif.0.i.i13.endif.1.i.i15_crit_edge:		; preds = %endif.0.i.i13
 	br label %endif.1.i.i15
@@ -614,7 +611,7 @@ then.1.i.i14:		; preds = %endif.0.i.i13
 	br label %endif.1.i.i15
 
 endif.1.i.i15:		; preds = %then.1.i.i14, %endif.0.i.i13.endif.1.i.i15_crit_edge
-	br bool false, label %loopentry.i8.i.i.no_exit.i9.i.i_crit_edge, label %loopentry.i8.i.i.pci_unregister_driver.exit.i.i_crit_edge
+	br i1 false, label %loopentry.i8.i.i.no_exit.i9.i.i_crit_edge, label %loopentry.i8.i.i.pci_unregister_driver.exit.i.i_crit_edge
 
 loopentry.i8.i.i:		; No predecessors!
 	unreachable
@@ -626,13 +623,13 @@ loopentry.i8.i.i.no_exit.i9.i.i_crit_edge:		; preds = %endif.1.i.i15
 	br label %no_exit.i9.i.i
 
 no_exit.i9.i.i:		; preds = %endif.0.i.i.i.no_exit.i9.i.i_crit_edge, %loopentry.i8.i.i.no_exit.i9.i.i_crit_edge
-	br bool false, label %then.0.i.i.i, label %no_exit.i9.i.i.endif.0.i.i.i_crit_edge
+	br i1 false, label %then.0.i.i.i, label %no_exit.i9.i.i.endif.0.i.i.i_crit_edge
 
 no_exit.i9.i.i.endif.0.i.i.i_crit_edge:		; preds = %no_exit.i9.i.i
 	br label %endif.0.i.i.i
 
 then.0.i.i.i:		; preds = %no_exit.i9.i.i
-	br bool false, label %then.1.i.i.i, label %then.0.i.i.i.endif.1.i.i.i_crit_edge
+	br i1 false, label %then.1.i.i.i, label %then.0.i.i.i.endif.1.i.i.i_crit_edge
 
 then.0.i.i.i.endif.1.i.i.i_crit_edge:		; preds = %then.0.i.i.i
 	br label %endif.1.i.i.i
@@ -644,7 +641,7 @@ endif.1.i.i.i:		; preds = %then.1.i.i.i, %then.0.i.i.i.endif.1.i.i.i_crit_edge
 	br label %endif.0.i.i.i
 
 endif.0.i.i.i:		; preds = %endif.1.i.i.i, %no_exit.i9.i.i.endif.0.i.i.i_crit_edge
-	br bool false, label %endif.0.i.i.i.no_exit.i9.i.i_crit_edge, label %endif.0.i.i.i.pci_unregister_driver.exit.i.i_crit_edge
+	br i1 false, label %endif.0.i.i.i.no_exit.i9.i.i_crit_edge, label %endif.0.i.i.i.pci_unregister_driver.exit.i.i_crit_edge
 
 endif.0.i.i.i.pci_unregister_driver.exit.i.i_crit_edge:		; preds = %endif.0.i.i.i
 	br label %pci_unregister_driver.exit.i.i
@@ -653,7 +650,7 @@ endif.0.i.i.i.no_exit.i9.i.i_crit_edge:		; preds = %endif.0.i.i.i
 	br label %no_exit.i9.i.i
 
 pci_unregister_driver.exit.i.i:		; preds = %endif.0.i.i.i.pci_unregister_driver.exit.i.i_crit_edge, %loopentry.i8.i.i.pci_unregister_driver.exit.i.i_crit_edge
-	br bool false, label %pci_module_init.exit.i.then.i_crit_edge, label %pci_module_init.exit.i.probe_serial_pci.exit_crit_edge
+	br i1 false, label %pci_module_init.exit.i.then.i_crit_edge, label %pci_module_init.exit.i.probe_serial_pci.exit_crit_edge
 
 pci_module_init.exit.i:		; No predecessors!
 	unreachable
@@ -668,13 +665,13 @@ then.i:		; preds = %pci_module_init.exit.i.then.i_crit_edge, %then.0.i.i12.then.
 	br label %probe_serial_pci.exit
 
 probe_serial_pci.exit:		; preds = %then.i, %pci_module_init.exit.i.probe_serial_pci.exit_crit_edge, %then.0.i.i12
-	br bool false, label %then.0.i, label %endif.0.i
+	br i1 false, label %then.0.i, label %endif.0.i
 
 then.0.i:		; preds = %probe_serial_pci.exit
 	ret void
 
 endif.0.i:		; preds = %probe_serial_pci.exit
-	br bool false, label %loopentry.0.i.no_exit.0.i_crit_edge, label %loopentry.0.i.loopexit.0.i_crit_edge
+	br i1 false, label %loopentry.0.i.no_exit.0.i_crit_edge, label %loopentry.0.i.loopexit.0.i_crit_edge
 
 loopentry.0.i:		; No predecessors!
 	unreachable
@@ -686,13 +683,13 @@ loopentry.0.i.no_exit.0.i_crit_edge:		; preds = %endif.0.i
 	br label %no_exit.0.i
 
 no_exit.0.i:		; preds = %loopcont.0.i.no_exit.0.i_crit_edge, %loopentry.0.i.no_exit.0.i_crit_edge
-	br bool false, label %then.1.i, label %endif.1.i
+	br i1 false, label %then.1.i, label %endif.1.i
 
 then.1.i:		; preds = %no_exit.0.i
 	br label %loopcont.0.i
 
 endif.1.i:		; preds = %no_exit.0.i
-	br bool false, label %loopentry.1.i.no_exit.1.i_crit_edge, label %loopentry.1.i.loopexit.1.i_crit_edge
+	br i1 false, label %loopentry.1.i.no_exit.1.i_crit_edge, label %loopentry.1.i.loopexit.1.i_crit_edge
 
 loopentry.1.i:		; No predecessors!
 	unreachable
@@ -704,7 +701,7 @@ loopentry.1.i.no_exit.1.i_crit_edge:		; preds = %endif.1.i
 	br label %no_exit.1.i
 
 no_exit.1.i:		; preds = %endif.2.i.no_exit.1.i_crit_edge, %loopentry.1.i.no_exit.1.i_crit_edge
-	br bool false, label %shortcirc_next.0.i, label %no_exit.1.i.shortcirc_done.0.i_crit_edge
+	br i1 false, label %shortcirc_next.0.i, label %no_exit.1.i.shortcirc_done.0.i_crit_edge
 
 no_exit.1.i.shortcirc_done.0.i_crit_edge:		; preds = %no_exit.1.i
 	br label %shortcirc_done.0.i
@@ -713,10 +710,10 @@ shortcirc_next.0.i:		; preds = %no_exit.1.i
 	br label %shortcirc_done.0.i
 
 shortcirc_done.0.i:		; preds = %shortcirc_next.0.i, %no_exit.1.i.shortcirc_done.0.i_crit_edge
-	br bool false, label %then.2.i, label %endif.2.i
+	br i1 false, label %then.2.i, label %endif.2.i
 
 then.2.i:		; preds = %shortcirc_done.0.i
-	br bool false, label %then.2.i.then.3.i_crit_edge, label %then.2.i.else.i_crit_edge
+	br i1 false, label %then.2.i.then.3.i_crit_edge, label %then.2.i.else.i_crit_edge
 
 then.2.i.else.i_crit_edge:		; preds = %then.2.i
 	br label %else.i
@@ -725,7 +722,7 @@ then.2.i.then.3.i_crit_edge:		; preds = %then.2.i
 	br label %then.3.i
 
 endif.2.i:		; preds = %shortcirc_done.0.i
-	br bool false, label %endif.2.i.no_exit.1.i_crit_edge, label %endif.2.i.loopexit.1.i_crit_edge
+	br i1 false, label %endif.2.i.no_exit.1.i_crit_edge, label %endif.2.i.loopexit.1.i_crit_edge
 
 endif.2.i.loopexit.1.i_crit_edge:		; preds = %endif.2.i
 	br label %loopexit.1.i
@@ -734,7 +731,7 @@ endif.2.i.no_exit.1.i_crit_edge:		; preds = %endif.2.i
 	br label %no_exit.1.i
 
 loopexit.1.i:		; preds = %endif.2.i.loopexit.1.i_crit_edge, %loopentry.1.i.loopexit.1.i_crit_edge
-	br bool false, label %loopexit.1.i.then.3.i_crit_edge, label %loopexit.1.i.else.i_crit_edge
+	br i1 false, label %loopexit.1.i.then.3.i_crit_edge, label %loopexit.1.i.else.i_crit_edge
 
 loopexit.1.i.else.i_crit_edge:		; preds = %loopexit.1.i
 	br label %else.i
@@ -743,7 +740,7 @@ loopexit.1.i.then.3.i_crit_edge:		; preds = %loopexit.1.i
 	br label %then.3.i
 
 then.3.i:		; preds = %loopexit.1.i.then.3.i_crit_edge, %then.2.i.then.3.i_crit_edge
-	br bool false, label %shortcirc_next.1.i, label %then.3.i.shortcirc_done.1.i_crit_edge
+	br i1 false, label %shortcirc_next.1.i, label %then.3.i.shortcirc_done.1.i_crit_edge
 
 then.3.i.shortcirc_done.1.i_crit_edge:		; preds = %then.3.i
 	br label %shortcirc_done.1.i
@@ -752,7 +749,7 @@ shortcirc_next.1.i:		; preds = %then.3.i
 	br label %shortcirc_done.1.i
 
 shortcirc_done.1.i:		; preds = %shortcirc_next.1.i, %then.3.i.shortcirc_done.1.i_crit_edge
-	br bool false, label %then.4.i, label %endif.4.i
+	br i1 false, label %then.4.i, label %endif.4.i
 
 then.4.i:		; preds = %shortcirc_done.1.i
 	br label %endif.3.i
@@ -761,7 +758,7 @@ endif.4.i:		; preds = %shortcirc_done.1.i
 	br label %endif.3.i
 
 else.i:		; preds = %loopexit.1.i.else.i_crit_edge, %then.2.i.else.i_crit_edge
-	br bool false, label %shortcirc_next.0.i.i, label %else.i.shortcirc_done.0.i.i_crit_edge
+	br i1 false, label %shortcirc_next.0.i.i, label %else.i.shortcirc_done.0.i.i_crit_edge
 
 else.i.shortcirc_done.0.i.i_crit_edge:		; preds = %else.i
 	br label %shortcirc_done.0.i.i
@@ -770,13 +767,13 @@ shortcirc_next.0.i.i:		; preds = %else.i
 	br label %shortcirc_done.0.i.i
 
 shortcirc_done.0.i.i:		; preds = %shortcirc_next.0.i.i, %else.i.shortcirc_done.0.i.i_crit_edge
-	br bool false, label %shortcirc_next.1.i.i, label %shortcirc_done.0.i.i.shortcirc_done.1.i.i_crit_edge
+	br i1 false, label %shortcirc_next.1.i.i, label %shortcirc_done.0.i.i.shortcirc_done.1.i.i_crit_edge
 
 shortcirc_done.0.i.i.shortcirc_done.1.i.i_crit_edge:		; preds = %shortcirc_done.0.i.i
 	br label %shortcirc_done.1.i.i
 
 shortcirc_next.1.i.i:		; preds = %shortcirc_done.0.i.i
-	br bool false, label %loopentry.i.i2.i.no_exit.i.i3.i_crit_edge, label %loopentry.i.i2.i.loopexit.i.i.i_crit_edge
+	br i1 false, label %loopentry.i.i2.i.no_exit.i.i3.i_crit_edge, label %loopentry.i.i2.i.loopexit.i.i.i_crit_edge
 
 loopentry.i.i2.i:		; No predecessors!
 	unreachable
@@ -788,7 +785,7 @@ loopentry.i.i2.i.no_exit.i.i3.i_crit_edge:		; preds = %shortcirc_next.1.i.i
 	br label %no_exit.i.i3.i
 
 no_exit.i.i3.i:		; preds = %endif.i.i.i.no_exit.i.i3.i_crit_edge, %loopentry.i.i2.i.no_exit.i.i3.i_crit_edge
-	br bool false, label %shortcirc_next.0.i.i.i, label %no_exit.i.i3.i.shortcirc_done.0.i.i.i_crit_edge
+	br i1 false, label %shortcirc_next.0.i.i.i, label %no_exit.i.i3.i.shortcirc_done.0.i.i.i_crit_edge
 
 no_exit.i.i3.i.shortcirc_done.0.i.i.i_crit_edge:		; preds = %no_exit.i.i3.i
 	br label %shortcirc_done.0.i.i.i
@@ -797,7 +794,7 @@ shortcirc_next.0.i.i.i:		; preds = %no_exit.i.i3.i
 	br label %shortcirc_done.0.i.i.i
 
 shortcirc_done.0.i.i.i:		; preds = %shortcirc_next.0.i.i.i, %no_exit.i.i3.i.shortcirc_done.0.i.i.i_crit_edge
-	br bool false, label %shortcirc_next.1.i.i.i, label %shortcirc_done.0.i.i.i.shortcirc_done.1.i.i.i_crit_edge
+	br i1 false, label %shortcirc_next.1.i.i.i, label %shortcirc_done.0.i.i.i.shortcirc_done.1.i.i.i_crit_edge
 
 shortcirc_done.0.i.i.i.shortcirc_done.1.i.i.i_crit_edge:		; preds = %shortcirc_done.0.i.i.i
 	br label %shortcirc_done.1.i.i.i
@@ -806,7 +803,7 @@ shortcirc_next.1.i.i.i:		; preds = %shortcirc_done.0.i.i.i
 	br label %shortcirc_done.1.i.i.i
 
 shortcirc_done.1.i.i.i:		; preds = %shortcirc_next.1.i.i.i, %shortcirc_done.0.i.i.i.shortcirc_done.1.i.i.i_crit_edge
-	br bool false, label %then.i.i.i, label %endif.i.i.i
+	br i1 false, label %then.i.i.i, label %endif.i.i.i
 
 then.i.i.i:		; preds = %shortcirc_done.1.i.i.i
 	br label %then.0.i.i
@@ -818,7 +815,7 @@ then.i.i.i.then.0.i.i_crit_edge:		; No predecessors!
 	unreachable
 
 endif.i.i.i:		; preds = %shortcirc_done.1.i.i.i
-	br bool false, label %endif.i.i.i.no_exit.i.i3.i_crit_edge, label %endif.i.i.i.loopexit.i.i.i_crit_edge
+	br i1 false, label %endif.i.i.i.no_exit.i.i3.i_crit_edge, label %endif.i.i.i.loopexit.i.i.i_crit_edge
 
 endif.i.i.i.loopexit.i.i.i_crit_edge:		; preds = %endif.i.i.i
 	br label %loopexit.i.i.i
@@ -833,7 +830,7 @@ check_compatible_id.exit.i.i:		; No predecessors!
 	unreachable
 
 shortcirc_done.1.i.i:		; preds = %loopexit.i.i.i, %shortcirc_done.0.i.i.shortcirc_done.1.i.i_crit_edge
-	br bool false, label %shortcirc_done.1.i.i.then.0.i.i_crit_edge, label %shortcirc_done.1.i.i.endif.0.i.i_crit_edge
+	br i1 false, label %shortcirc_done.1.i.i.then.0.i.i_crit_edge, label %shortcirc_done.1.i.i.endif.0.i.i_crit_edge
 
 shortcirc_done.1.i.i.endif.0.i.i_crit_edge:		; preds = %shortcirc_done.1.i.i
 	br label %endif.0.i.i
@@ -851,7 +848,7 @@ then.0.i.i.then.5.i_crit_edge:		; No predecessors!
 	unreachable
 
 endif.0.i.i:		; preds = %shortcirc_done.1.i.i.endif.0.i.i_crit_edge
-	br bool false, label %endif.0.i.i.shortcirc_done.2.i.i_crit_edge, label %shortcirc_next.2.i.i
+	br i1 false, label %endif.0.i.i.shortcirc_done.2.i.i_crit_edge, label %shortcirc_next.2.i.i
 
 endif.0.i.i.shortcirc_done.2.i.i_crit_edge:		; preds = %endif.0.i.i
 	br label %shortcirc_done.2.i.i
@@ -860,7 +857,7 @@ shortcirc_next.2.i.i:		; preds = %endif.0.i.i
 	br label %shortcirc_done.2.i.i
 
 shortcirc_done.2.i.i:		; preds = %shortcirc_next.2.i.i, %endif.0.i.i.shortcirc_done.2.i.i_crit_edge
-	br bool false, label %then.1.i.i, label %endif.1.i.i
+	br i1 false, label %then.1.i.i, label %endif.1.i.i
 
 then.1.i.i:		; preds = %shortcirc_done.2.i.i
 	br label %then.5.i
@@ -872,7 +869,7 @@ then.1.i.i.then.5.i_crit_edge:		; No predecessors!
 	unreachable
 
 endif.1.i.i:		; preds = %shortcirc_done.2.i.i
-	br bool false, label %loopentry.0.i7.i.no_exit.0.i8.i_crit_edge, label %loopentry.0.i7.i.loopexit.0.i11.i_crit_edge
+	br i1 false, label %loopentry.0.i7.i.no_exit.0.i8.i_crit_edge, label %loopentry.0.i7.i.loopexit.0.i11.i_crit_edge
 
 loopentry.0.i7.i:		; No predecessors!
 	unreachable
@@ -884,7 +881,7 @@ loopentry.0.i7.i.no_exit.0.i8.i_crit_edge:		; preds = %endif.1.i.i
 	br label %no_exit.0.i8.i
 
 no_exit.0.i8.i:		; preds = %loopexit.1.i.i.no_exit.0.i8.i_crit_edge, %loopentry.0.i7.i.no_exit.0.i8.i_crit_edge
-	br bool false, label %loopentry.1.i9.i.no_exit.1.i10.i_crit_edge, label %loopentry.1.i9.i.loopexit.1.i.i_crit_edge
+	br i1 false, label %loopentry.1.i9.i.no_exit.1.i10.i_crit_edge, label %loopentry.1.i9.i.loopexit.1.i.i_crit_edge
 
 loopentry.1.i9.i:		; No predecessors!
 	unreachable
@@ -896,13 +893,13 @@ loopentry.1.i9.i.no_exit.1.i10.i_crit_edge:		; preds = %no_exit.0.i8.i
 	br label %no_exit.1.i10.i
 
 no_exit.1.i10.i:		; preds = %endif.2.i.i.no_exit.1.i10.i_crit_edge, %loopentry.1.i9.i.no_exit.1.i10.i_crit_edge
-	br bool false, label %shortcirc_next.3.i.i, label %no_exit.1.i10.i.shortcirc_done.3.i.i_crit_edge
+	br i1 false, label %shortcirc_next.3.i.i, label %no_exit.1.i10.i.shortcirc_done.3.i.i_crit_edge
 
 no_exit.1.i10.i.shortcirc_done.3.i.i_crit_edge:		; preds = %no_exit.1.i10.i
 	br label %shortcirc_done.3.i.i
 
 shortcirc_next.3.i.i:		; preds = %no_exit.1.i10.i
-	br bool false, label %shortcirc_next.3.i.i.shortcirc_done.4.i.i_crit_edge, label %shortcirc_next.4.i.i
+	br i1 false, label %shortcirc_next.3.i.i.shortcirc_done.4.i.i_crit_edge, label %shortcirc_next.4.i.i
 
 shortcirc_next.3.i.i.shortcirc_done.4.i.i_crit_edge:		; preds = %shortcirc_next.3.i.i
 	br label %shortcirc_done.4.i.i
@@ -911,22 +908,22 @@ shortcirc_next.4.i.i:		; preds = %shortcirc_next.3.i.i
 	br label %shortcirc_done.4.i.i
 
 shortcirc_done.4.i.i:		; preds = %shortcirc_next.4.i.i, %shortcirc_next.3.i.i.shortcirc_done.4.i.i_crit_edge
-	br bool false, label %shortcirc_done.4.i.i.shortcirc_done.5.i.i_crit_edge, label %shortcirc_next.5.i.i
+	br i1 false, label %shortcirc_done.4.i.i.shortcirc_done.5.i.i_crit_edge, label %shortcirc_next.5.i.i
 
 shortcirc_done.4.i.i.shortcirc_done.5.i.i_crit_edge:		; preds = %shortcirc_done.4.i.i
 	br label %shortcirc_done.5.i.i
 
 shortcirc_next.5.i.i:		; preds = %shortcirc_done.4.i.i
-	%tmp.68.i.i = seteq ushort 0, 1000		; <bool> [#uses=1]
+	%tmp.68.i.i = icmp eq i16 0, 1000		; <i1> [#uses=1]
 	br label %shortcirc_done.5.i.i
 
 shortcirc_done.5.i.i:		; preds = %shortcirc_next.5.i.i, %shortcirc_done.4.i.i.shortcirc_done.5.i.i_crit_edge
-	%shortcirc_val.4.i.i = phi bool [ true, %shortcirc_done.4.i.i.shortcirc_done.5.i.i_crit_edge ], [ %tmp.68.i.i, %shortcirc_next.5.i.i ]		; <bool> [#uses=1]
+	%shortcirc_val.4.i.i = phi i1 [ true, %shortcirc_done.4.i.i.shortcirc_done.5.i.i_crit_edge ], [ %tmp.68.i.i, %shortcirc_next.5.i.i ]		; <i1> [#uses=1]
 	br label %shortcirc_done.3.i.i
 
 shortcirc_done.3.i.i:		; preds = %shortcirc_done.5.i.i, %no_exit.1.i10.i.shortcirc_done.3.i.i_crit_edge
-	%shortcirc_val.5.i.i = phi bool [ false, %no_exit.1.i10.i.shortcirc_done.3.i.i_crit_edge ], [ %shortcirc_val.4.i.i, %shortcirc_done.5.i.i ]		; <bool> [#uses=1]
-	br bool %shortcirc_val.5.i.i, label %then.2.i.i, label %endif.2.i.i
+	%shortcirc_val.5.i.i = phi i1 [ false, %no_exit.1.i10.i.shortcirc_done.3.i.i_crit_edge ], [ %shortcirc_val.4.i.i, %shortcirc_done.5.i.i ]		; <i1> [#uses=1]
+	br i1 %shortcirc_val.5.i.i, label %then.2.i.i, label %endif.2.i.i
 
 then.2.i.i:		; preds = %shortcirc_done.3.i.i
 	%port.2.i.i.8.lcssa20 = phi %struct.isapnp_port* [ null, %shortcirc_done.3.i.i ]		; <%struct.isapnp_port*> [#uses=0]
@@ -939,7 +936,7 @@ then.2.i.i.then.5.i_crit_edge:		; No predecessors!
 	unreachable
 
 endif.2.i.i:		; preds = %shortcirc_done.3.i.i
-	br bool false, label %endif.2.i.i.no_exit.1.i10.i_crit_edge, label %endif.2.i.i.loopexit.1.i.i_crit_edge
+	br i1 false, label %endif.2.i.i.no_exit.1.i10.i_crit_edge, label %endif.2.i.i.loopexit.1.i.i_crit_edge
 
 endif.2.i.i.loopexit.1.i.i_crit_edge:		; preds = %endif.2.i.i
 	br label %loopexit.1.i.i
@@ -948,7 +945,7 @@ endif.2.i.i.no_exit.1.i10.i_crit_edge:		; preds = %endif.2.i.i
 	br label %no_exit.1.i10.i
 
 loopexit.1.i.i:		; preds = %endif.2.i.i.loopexit.1.i.i_crit_edge, %loopentry.1.i9.i.loopexit.1.i.i_crit_edge
-	br bool false, label %loopexit.1.i.i.no_exit.0.i8.i_crit_edge, label %loopexit.1.i.i.loopexit.0.i11.i_crit_edge
+	br i1 false, label %loopexit.1.i.i.no_exit.0.i8.i_crit_edge, label %loopexit.1.i.i.loopexit.0.i11.i_crit_edge
 
 loopexit.1.i.i.loopexit.0.i11.i_crit_edge:		; preds = %loopexit.1.i.i
 	br label %loopexit.0.i11.i
@@ -957,7 +954,7 @@ loopexit.1.i.i.no_exit.0.i8.i_crit_edge:		; preds = %loopexit.1.i.i
 	br label %no_exit.0.i8.i
 
 loopexit.0.i11.i:		; preds = %loopexit.1.i.i.loopexit.0.i11.i_crit_edge, %loopentry.0.i7.i.loopexit.0.i11.i_crit_edge
-	br bool false, label %serial_pnp_guess_board.exit.i.then.5.i_crit_edge, label %serial_pnp_guess_board.exit.i.endif.5.i_crit_edge
+	br i1 false, label %serial_pnp_guess_board.exit.i.then.5.i_crit_edge, label %serial_pnp_guess_board.exit.i.endif.5.i_crit_edge
 
 serial_pnp_guess_board.exit.i:		; No predecessors!
 	unreachable
@@ -975,7 +972,7 @@ endif.5.i:		; preds = %serial_pnp_guess_board.exit.i.endif.5.i_crit_edge, %then.
 	br label %endif.3.i
 
 endif.3.i:		; preds = %endif.5.i, %endif.4.i, %then.4.i
-	br bool false, label %then.6.i, label %endif.3.i.endif.6.i_crit_edge
+	br i1 false, label %then.6.i, label %endif.3.i.endif.6.i_crit_edge
 
 endif.3.i.endif.6.i_crit_edge:		; preds = %endif.3.i
 	br label %endif.6.i
@@ -984,7 +981,7 @@ then.6.i:		; preds = %endif.3.i
 	br label %loopentry.0.i.i
 
 loopentry.0.i.i:		; preds = %endif.i.i, %then.6.i
-	br bool false, label %loopentry.0.i.i.no_exit.0.i.i_crit_edge, label %loopentry.0.i.i.loopexit.0.i.i_crit_edge
+	br i1 false, label %loopentry.0.i.i.no_exit.0.i.i_crit_edge, label %loopentry.0.i.i.loopexit.0.i.i_crit_edge
 
 loopentry.0.i.i.loopexit.0.i.i_crit_edge:		; preds = %loopentry.0.i.i
 	br label %loopexit.0.i.i
@@ -993,19 +990,19 @@ loopentry.0.i.i.no_exit.0.i.i_crit_edge:		; preds = %loopentry.0.i.i
 	br label %no_exit.0.i.i
 
 no_exit.0.i.i:		; preds = %clear_bit195.exit.i.i.no_exit.0.i.i_crit_edge, %loopentry.0.i.i.no_exit.0.i.i_crit_edge
-	br bool false, label %then.i.i, label %endif.i.i
+	br i1 false, label %then.i.i, label %endif.i.i
 
 then.i.i:		; preds = %no_exit.0.i.i
 	br label %loopentry.i.i.i
 
 loopentry.i.i.i:		; preds = %no_exit.i.i.i, %then.i.i
-	br bool false, label %no_exit.i.i.i, label %clear_bit195.exit.i.i
+	br i1 false, label %no_exit.i.i.i, label %clear_bit195.exit.i.i
 
 no_exit.i.i.i:		; preds = %loopentry.i.i.i
 	br label %loopentry.i.i.i
 
 clear_bit195.exit.i.i:		; preds = %loopentry.i.i.i
-	br bool false, label %clear_bit195.exit.i.i.no_exit.0.i.i_crit_edge, label %clear_bit195.exit.i.i.loopexit.0.i.i_crit_edge
+	br i1 false, label %clear_bit195.exit.i.i.no_exit.0.i.i_crit_edge, label %clear_bit195.exit.i.i.loopexit.0.i.i_crit_edge
 
 clear_bit195.exit.i.i.loopexit.0.i.i_crit_edge:		; preds = %clear_bit195.exit.i.i
 	br label %loopexit.0.i.i
@@ -1017,7 +1014,7 @@ endif.i.i:		; preds = %no_exit.0.i.i
 	br label %loopentry.0.i.i
 
 loopexit.0.i.i:		; preds = %clear_bit195.exit.i.i.loopexit.0.i.i_crit_edge, %loopentry.0.i.i.loopexit.0.i.i_crit_edge
-	br bool false, label %loopentry.1.i.i.no_exit.1.i.i_crit_edge, label %loopentry.1.i.i.avoid_irq_share.exit.i_crit_edge
+	br i1 false, label %loopentry.1.i.i.no_exit.1.i.i_crit_edge, label %loopentry.1.i.i.avoid_irq_share.exit.i_crit_edge
 
 loopentry.1.i.i:		; No predecessors!
 	unreachable
@@ -1029,7 +1026,7 @@ loopentry.1.i.i.no_exit.1.i.i_crit_edge:		; preds = %loopexit.0.i.i
 	br label %no_exit.1.i.i
 
 no_exit.1.i.i:		; preds = %loopexit.2.i.i.no_exit.1.i.i_crit_edge, %loopentry.1.i.i.no_exit.1.i.i_crit_edge
-	br bool false, label %loopentry.2.i.i.no_exit.2.i.i_crit_edge, label %loopentry.2.i.i.loopexit.2.i.i_crit_edge
+	br i1 false, label %loopentry.2.i.i.no_exit.2.i.i_crit_edge, label %loopentry.2.i.i.loopexit.2.i.i_crit_edge
 
 loopentry.2.i.i:		; No predecessors!
 	unreachable
@@ -1041,7 +1038,7 @@ loopentry.2.i.i.no_exit.2.i.i_crit_edge:		; preds = %no_exit.1.i.i
 	br label %no_exit.2.i.i
 
 no_exit.2.i.i:		; preds = %no_exit.2.i.i.no_exit.2.i.i_crit_edge, %loopentry.2.i.i.no_exit.2.i.i_crit_edge
-	br bool false, label %no_exit.2.i.i.no_exit.2.i.i_crit_edge, label %no_exit.2.i.i.loopexit.2.i.i_crit_edge
+	br i1 false, label %no_exit.2.i.i.no_exit.2.i.i_crit_edge, label %no_exit.2.i.i.loopexit.2.i.i_crit_edge
 
 no_exit.2.i.i.loopexit.2.i.i_crit_edge:		; preds = %no_exit.2.i.i
 	br label %loopexit.2.i.i
@@ -1050,7 +1047,7 @@ no_exit.2.i.i.no_exit.2.i.i_crit_edge:		; preds = %no_exit.2.i.i
 	br label %no_exit.2.i.i
 
 loopexit.2.i.i:		; preds = %no_exit.2.i.i.loopexit.2.i.i_crit_edge, %loopentry.2.i.i.loopexit.2.i.i_crit_edge
-	br bool false, label %loopexit.2.i.i.no_exit.1.i.i_crit_edge, label %loopexit.2.i.i.avoid_irq_share.exit.i_crit_edge
+	br i1 false, label %loopexit.2.i.i.no_exit.1.i.i_crit_edge, label %loopexit.2.i.i.avoid_irq_share.exit.i_crit_edge
 
 loopexit.2.i.i.avoid_irq_share.exit.i_crit_edge:		; preds = %loopexit.2.i.i
 	br label %avoid_irq_share.exit.i
@@ -1065,7 +1062,7 @@ endif.6.i:		; preds = %avoid_irq_share.exit.i, %endif.3.i.endif.6.i_crit_edge
 	br label %loopcont.0.i
 
 loopcont.0.i:		; preds = %endif.6.i, %then.5.i, %then.1.i
-	br bool false, label %loopcont.0.i.no_exit.0.i_crit_edge, label %loopcont.0.i.loopexit.0.i_crit_edge
+	br i1 false, label %loopcont.0.i.no_exit.0.i_crit_edge, label %loopcont.0.i.loopexit.0.i_crit_edge
 
 loopcont.0.i.loopexit.0.i_crit_edge:		; preds = %loopcont.0.i
 	br label %loopexit.0.i
diff --git a/test/Transforms/CondProp/basictest.ll b/test/Transforms/CondProp/basictest.ll
index 1e2a936..eda104d 100644
--- a/test/Transforms/CondProp/basictest.ll
+++ b/test/Transforms/CondProp/basictest.ll
@@ -1,19 +1,27 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -condprop | llvm-dis | \
+; RUN: llvm-as < %s | opt -condprop | llvm-dis | \
 ; RUN:    not grep {br label}
 
-int %test(bool %C) {
-	br bool %C, label %T1, label %F1
-T1:
-	br label %Cont
-F1:
-	br label %Cont
-Cont:
-	%C2 = phi bool [false, %F1], [true, %T1]
-	br bool %C2, label %T2, label %F2
-T2:
-	call void %bar()
-	ret int 17
-F2:
-	ret int 1
+
+define i32 @test(i1 %C) {
+        br i1 %C, label %T1, label %F1
+
+T1:             ; preds = %0
+        br label %Cont
+
+F1:             ; preds = %0
+        br label %Cont
+
+Cont:           ; preds = %F1, %T1
+        %C2 = phi i1 [ false, %F1 ], [ true, %T1 ]              ; <i1> [#uses=1]
+        br i1 %C2, label %T2, label %F2
+
+T2:             ; preds = %Cont
+        call void @bar( )
+        ret i32 17
+
+F2:             ; preds = %Cont
+        ret i32 1
 }
-declare void %bar()
+
+declare void @bar()
+
diff --git a/test/Transforms/CondProp/phisimplify.ll b/test/Transforms/CondProp/phisimplify.ll
index a4728eb..5b5a304 100644
--- a/test/Transforms/CondProp/phisimplify.ll
+++ b/test/Transforms/CondProp/phisimplify.ll
@@ -1,33 +1,43 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -condprop | llvm-dis | not grep phi
+; RUN: llvm-as < %s | opt -condprop | llvm-dis | not grep phi
 
-int %test(uint %C, bool %Val) {
-        switch uint %C, label %T1 [
-                 uint 4, label %T2
-                 uint 17, label %T3
+define i32 @test(i32 %C, i1 %Val) {
+        switch i32 %C, label %T1 [
+                 i32 4, label %T2
+                 i32 17, label %T3
         ]
-T1:
-	call void %a()
-	br label %Cont
-T2:
-	call void %b()
-	br label %Cont
-T3:
-	call void %c()
-	br label %Cont
-
-Cont:
-	;; PHI becomes dead after threading T2
-	%C2 = phi bool [%Val, %T1], [true, %T2], [%Val, %T3]
-	br bool %C2, label %L2, label %F2
-L2:
-	call void %d()
-	ret int 17
-F2:
-	call void %e()
-	ret int 1
+
+T1:             ; preds = %0
+        call void @a( )
+        br label %Cont
+
+T2:             ; preds = %0
+        call void @b( )
+        br label %Cont
+
+T3:             ; preds = %0
+        call void @c( )
+        br label %Cont
+
+Cont:           ; preds = %T3, %T2, %T1
+        ;; PHI becomes dead after threading T2
+        %C2 = phi i1 [ %Val, %T1 ], [ true, %T2 ], [ %Val, %T3 ]                ; <i1> [#uses=1]
+        br i1 %C2, label %L2, label %F2
+
+L2:             ; preds = %Cont
+        call void @d( )
+        ret i32 17
+
+F2:             ; preds = %Cont
+        call void @e( )
+        ret i32 1
 }
-declare void %a()
-declare void %b()
-declare void %c()
-declare void %d()
-declare void %e()
+
+declare void @a()
+
+declare void @b()
+
+declare void @c()
+
+declare void @d()
+
+declare void @e()
diff --git a/test/Transforms/CondProp/phisimplify2.ll b/test/Transforms/CondProp/phisimplify2.ll
index 4c83fa3..03d12e3 100644
--- a/test/Transforms/CondProp/phisimplify2.ll
+++ b/test/Transforms/CondProp/phisimplify2.ll
@@ -1,36 +1,46 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -condprop | llvm-dis | not grep phi
+; RUN: llvm-as < %s | opt -condprop | llvm-dis | not grep phi
 
-declare bool %foo()
+declare i1 @foo()
 
-int %test(uint %C) {
- 	%Val = call bool %foo()
-        switch uint %C, label %T1 [
-                 uint 4, label %T2
-                 uint 17, label %T3
+define i32 @test(i32 %C) {
+        %Val = call i1 @foo( )          ; <i1> [#uses=2]
+        switch i32 %C, label %T1 [
+                 i32 4, label %T2
+                 i32 17, label %T3
         ]
-T1:
-	call void %a()
-	br label %Cont
-T2:
-	call void %b()
-	br label %Cont
-T3:
-	call void %c()
-	br label %Cont
-
-Cont:
-	;; PHI becomes dead after threading T2
-	%C2 = phi bool [%Val, %T1], [true, %T2], [%Val, %T3]
-	br bool %C2, label %L2, label %F2
-L2:
-	call void %d()
-	ret int 17
-F2:
-	call void %e()
-	ret int 1
+
+T1:             ; preds = %0
+        call void @a( )
+        br label %Cont
+
+T2:             ; preds = %0
+        call void @b( )
+        br label %Cont
+
+T3:             ; preds = %0
+        call void @c( )
+        br label %Cont
+
+Cont:           ; preds = %T3, %T2, %T1
+        ;; PHI becomes dead after threading T2
+        %C2 = phi i1 [ %Val, %T1 ], [ true, %T2 ], [ %Val, %T3 ]                ; <i1> [#uses=1]
+        br i1 %C2, label %L2, label %F2
+
+L2:             ; preds = %Cont
+        call void @d( )
+        ret i32 17
+
+F2:             ; preds = %Cont
+        call void @e( )
+        ret i32 1
 }
-declare void %a()
-declare void %b()
-declare void %c()
-declare void %d()
-declare void %e()
+
+declare void @a()
+
+declare void @b()
+
+declare void @c()
+
+declare void @d()
+
+declare void @e()