From ea97f3929567b2b7db49a6ded3bf6c4b2733a686 Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Fri, 23 Apr 2021 22:07:54 -0700 Subject: [PATCH] ANDROID: GKI: update ABI description Update ABI description in prperation for 4/23 KMI update Leaf changes summary: 3103 artifacts changed Changed leaf types summary: 15 leaf types changed Removed/Changed/Added functions summary: 0 Removed, 3030 Changed, 0 Added function Removed/Changed/Added variables summary: 0 Removed, 58 Changed, 0 Added variable 3030 functions with some sub-type change: [C] 'function int dev_pm_genpd_set_next_wakeup(device*, ktime_t)' at domain.c:441:1 has some sub-type changes: CRC (modversions) changed from 0x5f5fcb7c to 0xf61e0895 return type changed: type name changed from 'int' to 'void' type size changed from 32 to 0 (in bits) [C] 'function void* PDE_DATA(const inode*)' at generic.c:799:1 has some sub-type changes: CRC (modversions) changed from 0x44ca679 to 0xcab3cd66 [C] 'function void __ClearPageMovable(page*)' at compaction.c:138:1 has some sub-type changes: CRC (modversions) changed from 0x44484f05 to 0x9fa7085b [C] 'function void __SetPageMovable(page*, address_space*)' at compaction.c:130:1 has some sub-type changes: CRC (modversions) changed from 0x8978c2df to 0x41b1ba1a ... 3026 omitted; 3029 symbols have only CRC changes 58 Changed variables: [C] 'static_key_false cpu_hwcap_keys[61]' was changed to 'static_key_false cpu_hwcap_keys[76]' at cpufeature.c:150:1: size of symbol changed from 976 to 1216 CRC (modversions) changed from 0x4c98d79b to 0xec2fc692 type of variable changed: type name changed from 'static_key_false[61]' to 'static_key_false[76]' array type size changed from 7808 to 9728 array type subrange 1 changed length from 61 to 76 [C] 'unsigned long int cpu_hwcaps[1]' was changed to 'unsigned long int cpu_hwcaps[2]' at cpufeature.c:100:1: size of symbol changed from 8 to 16 CRC (modversions) changed from 0xaebd1b18 to 0x8b9f70c7 type of variable changed: type name changed from 'unsigned long int[1]' to 'unsigned long int[2]' array type size changed from 64 to 128 array type subrange 1 changed length from 1 to 2 [C] 'const vm_operations_struct drm_gem_cma_vm_ops' was changed at drm_gem_cma_helper.c:263:1: size of symbol changed from 136 to 144 CRC (modversions) changed from 0xafd38045 to 0xc092767b type of variable changed: [C] 'net init_net' was changed at net_namespace.c:47:1: CRC (modversions) changed from 0x75836cf9 to 0x8c00edd2 type of variable changed: type size hasn't changed there are data member changes: type 'struct netns_xfrm' of 'net::xfrm' changed: type size hasn't changed 1 data member insertion: 'seqcount_t xfrm_state_hash_generation', at offset 6176 (in bits) at xfrm.h:76:1 there are data member changes: 'spinlock_t xfrm_policy_lock' offset changed (by +32 bits) 'mutex xfrm_cfg_mutex' offset changed (by +64 bits) 3361 impacted interfaces 3361 impacted interfaces [C] 'rq runqueues' was changed at core.c:49:1: size of symbol changed from 4160 to 4416 CRC (modversions) changed from 0xfbaeea47 to 0x5137fc66 type of variable changed: type size changed from 33280 to 35328 (in bits) there are data member changes: 'uclamp_rq uclamp[2]' size changed from 768 to 2688 (in bits) (by +1920 bits) 'unsigned int uclamp_flags' offset changed (by +1920 bits) 61 ('cfs_rq cfs' .. 'u64 android_kabi_reserved4') offsets changed (by +2048 bits) 3361 impacted interfaces [C] 'const vm_operations_struct vb2_common_vm_ops' was changed at videobuf2-memops.c:122:1: size of symbol changed from 136 to 144 CRC (modversions) changed from 0x18a6cc01 to 0xfde2ba08 type of variable changed: [C] 'vm_event_state vm_event_states' was changed at vmstat.c:108:1: size of symbol changed from 720 to 728 CRC (modversions) changed from 0x85d767b0 to 0x62cac127 type of variable changed: type size changed from 5760 to 5824 (in bits) there are data member changes: type 'unsigned long int[90]' of 'vm_event_state::event' changed: type name changed from 'unsigned long int[90]' to 'unsigned long int[91]' array type size changed from 5760 to 5824 array type subrange 1 changed length from 90 to 91 one impacted interface [C] 'bus_type amba_bustype' was changed at bus.c:215:1: CRC (modversions) changed from 0xbbb1e519 to 0x84856996 [C] 'const address_space_operations balloon_aops' was changed at balloon_compaction.c:253:1: CRC (modversions) changed from 0x7769d265 to 0x807e3fab [C] 'const clk_ops clk_fixed_factor_ops' was changed at clk-fixed-factor.c:60:1: CRC (modversions) changed from 0x8a6ece13 to 0x26b088f0 ... 48 omitted; 51 symbols have only CRC changes 'struct dma_buf at dma-buf.h:397:1' changed (indirectly): type size changed from 3328 to 3392 (in bits) there are data member changes: type 'struct vm_operations_struct' of 'dma_buf::vm_ops' changed: type size changed from 1088 to 1152 (in bits) 1 data member insertion: 'typedef bool ()* allow_speculation', at offset 832 (in bits) at mm.h:651:1 there are data member changes: 4 ('u64 android_kabi_reserved1' .. 'u64 android_kabi_reserved4') offsets changed (by +64 bits) 3361 impacted interfaces 421 impacted interfaces 'struct dma_slave_config at dmaengine.h:434:1' changed: type size changed from 448 to 576 (in bits) 2 data member insertions: 'void* peripheral_config', at offset 448 (in bits) at dmaengine.h:449:1 'size_t peripheral_size', at offset 512 (in bits) at dmaengine.h:450:1 33 impacted interfaces 'struct dwc3 at core.h:1079:1' changed: type size hasn't changed 1 data member insertion: 'unsigned int usb2_gadget_lpm_disable', at offset 16 (in bits) at core.h:1250:1 there are data member changes: 21 ('unsigned int dis_tx_ipgap_linecheck_quirk' .. 'unsigned int dis_u2_freeclk_exists_quirk') offsets changed (by +1 bits) 'unsigned int dis_del_phy_power_chg_quirk' offset changed (by -31 bits) 2 impacted interfaces 'struct net at net_namespace.h:56:1' changed (indirectly): details were reported earlier 'struct netns_xfrm at xfrm.h:32:1' changed: details were reported earlier 'struct rq at sched.h:907:1' changed (indirectly): details were reported earlier 'struct snd_soc_component_driver at soc-component.h:67:1' changed: type size changed from 2752 to 2816 (in bits) 1 data member insertion: 'int (snd_soc_component*, snd_pcm_substream*)* ack', at offset 2304 (in bits) at soc-component.h:149:1 there are data member changes: 8 ('const snd_compress_ops* compress_ops' .. 'int be_pcm_base') offsets changed (by +64 bits) 65 impacted interfaces 'struct snd_soc_dai_link at soc.h:749:1' changed: type size changed from 1088 to 1600 (in bits) 1 data member insertion: 'snd_soc_dobj dobj', at offset 1088 (in bits) at soc.h:847:1 65 impacted interfaces 'struct soc_enum at soc.h:1257:1' changed: type size changed from 320 to 832 (in bits) 1 data member insertion: 'snd_soc_dobj dobj', at offset 320 (in bits) at soc.h:1267:1 one impacted interface 'struct tcpm_port at tcpm.c:297:1' changed: type size hasn't changed 1 data member insertion: 'bool slow_charger_loop', at offset 32080 (in bits) at tcpm.c:471:1 13 impacted interfaces 'struct uclamp_rq at sched.h:892:1' changed: type size changed from 384 to 1344 (in bits) there are data member changes: type 'uclamp_bucket[5]' of 'uclamp_rq::bucket' changed: type name changed from 'uclamp_bucket[5]' to 'uclamp_bucket[20]' array type size changed from 320 to 1280 array type subrange 1 changed length from 5 to 20 3361 impacted interfaces 'struct uclamp_se at sched.h:623:1' changed (indirectly): type size hasn't changed there are data member changes: 2 ('unsigned int active' .. 'unsigned int user_defined') offsets changed (by +2 bits) 3361 impacted interfaces 'struct user_struct at user.h:13:1' changed: type size changed from 960 to 1088 (in bits) 1 data member insertion: 'u64 android_oem_data1[2]', at offset 960 (in bits) at user.h:45:1 3361 impacted interfaces 'struct vm_event_state at vmstat.h:54:1' changed: details were reported earlier 'struct vm_operations_struct at mm.h:589:1' changed: details were reported earlier Bug: 186241007 Signed-off-by: Todd Kjos Change-Id: I9725b5164da30547176b67b96cb1cef66ef2bfdc --- android/abi_gki_aarch64.xml | 8318 ++++++++++++++++++----------------- 1 file changed, 4183 insertions(+), 4135 deletions(-) diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index bb8ee8bc2858..9f073b4d7f52 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml @@ -1,16 +1,16 @@ - - - - + + + + - - + + - + @@ -24,60 +24,60 @@ - - - - - - - + + + + + + + - - - - + + + + - - - + + + - - - + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + @@ -86,21 +86,21 @@ - + - + - + - + - - - - - - + + + + + + @@ -109,98 +109,98 @@ - - + + - + - + - - + + - - - - - + + + + + - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -209,8 +209,8 @@ - - + + @@ -222,17 +222,17 @@ - - - + + + - + - - + + - - + + @@ -240,17 +240,17 @@ - + - - - - - - - - - + + + + + + + + + @@ -277,11 +277,11 @@ - - - - - + + + + + @@ -291,31 +291,31 @@ - + - + - + - - - - + + + + - + - - - - + + + + - - + + @@ -326,40 +326,40 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -369,119 +369,119 @@ - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + @@ -490,145 +490,145 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - + + - + - + - - - - + + + + - - + + - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - + @@ -638,398 +638,398 @@ - - - - - - + + + + + + - - - + + + - + - - + + - - + + - - - + + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1046,57 +1046,57 @@ - - - - - - - - - + + + + + + + + + - + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + @@ -1110,488 +1110,488 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - + + + + + + - + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - + - - - - - + + + + + - - + + - + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - + - + - + - + - + - - + + - - - - - - - - - - - + + + + + + + + + + + @@ -1608,114 +1608,114 @@ - - - + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - + + - + - - - - - - + + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - - - - - + + + + + - + - - - - - + + + + + @@ -1728,69 +1728,69 @@ - - + + - - + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + @@ -1804,11 +1804,11 @@ - - + + - - + + @@ -1819,277 +1819,277 @@ - - - + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - + + + - + - + - - + + - - - - - + + + + + - - + + - + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - + - + @@ -2109,27 +2109,27 @@ - - - - - - + + + + + + - - - - - + + + + + - - + + - - - - + + + + @@ -2145,42 +2145,42 @@ - - - - - - - + + + + + + + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -2208,99 +2208,99 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + @@ -2309,51 +2309,51 @@ - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - + - + @@ -2364,377 +2364,377 @@ - - - - + + + + - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - + - - + + - + @@ -2745,50 +2745,50 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + + + + - + @@ -2827,45 +2827,45 @@ - + - - - + + + - + - - - - - - + + + + + + - + - + - + - - + + - - + + @@ -2873,95 +2873,95 @@ - - + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - + - - - - + + + + - + - - + + @@ -2972,455 +2972,455 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - + - + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - - + + + - + - + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -3448,7 +3448,7 @@ - + @@ -3470,13 +3470,13 @@ - - - - + + + + - - + + @@ -3486,41 +3486,41 @@ - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - + - - - + + + - + @@ -3531,22 +3531,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3554,218 +3554,218 @@ - - - + + + - - - - - - + + + + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - - + + - + - - + + - - - - - - - - - - + + + + + + + + + + - + - - - - - + + + + + - - - + + + - + - - - + + + - - + + - + @@ -3777,286 +3777,286 @@ - - - - - + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - + - + - - - + + + - - + + - - + + - - - + + + @@ -4069,76 +4069,76 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + @@ -4291,89 +4291,89 @@ - + - + - - - + + + - + - - + + - + - - - + + + - + - + - + - - - - - + + + + + - - - + + + - + - + - - - + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -4381,19 +4381,19 @@ - + - + - - + + - - + + @@ -4410,16 +4410,16 @@ - - - + + + - + - - - + + + @@ -4430,8 +4430,8 @@ - - + + @@ -4440,8 +4440,8 @@ - - + + @@ -4452,8 +4452,8 @@ - - + + @@ -5961,9 +5961,6 @@ - - - @@ -10363,10 +10360,10 @@ - + - + @@ -10637,6 +10634,9 @@ + + + @@ -11803,7 +11803,7 @@ - + @@ -11837,6 +11837,9 @@ + + + @@ -13666,12 +13669,12 @@ - + - + - + @@ -14453,6 +14456,9 @@ + + + @@ -14469,7 +14475,7 @@ - + @@ -14488,7 +14494,7 @@ - + @@ -16552,10 +16558,13 @@ - + - + + + + @@ -17034,7 +17043,7 @@ - + @@ -17065,190 +17074,190 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -17458,7 +17467,7 @@ - + @@ -17480,7 +17489,7 @@ - + @@ -17505,7 +17514,7 @@ - + @@ -17762,7 +17771,7 @@ - + @@ -17778,7 +17787,7 @@ - + @@ -17813,7 +17822,7 @@ - + @@ -17864,7 +17873,7 @@ - + @@ -20599,7 +20608,7 @@ - + @@ -20628,7 +20637,7 @@ - + @@ -20636,7 +20645,7 @@ - + @@ -20655,7 +20664,7 @@ - + @@ -23424,12 +23433,12 @@ - + - + @@ -23439,7 +23448,7 @@ - + @@ -23480,16 +23489,19 @@ - + - + - + - + + + + @@ -23730,7 +23742,7 @@ - + @@ -26514,9 +26526,6 @@ - - - @@ -26526,8 +26535,8 @@ - - + + @@ -34688,12 +34697,12 @@ - + - + - + @@ -43005,12 +43014,12 @@ - - - - - - + + + + + + @@ -44589,176 +44598,176 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -44775,34 +44784,34 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -44823,38 +44832,38 @@ - - - + + + - - + + - - - - + + + + - - - + + + - - + + - - - + + + - - - + + + @@ -44862,18 +44871,18 @@ - - - + + + + + + + - - - - - - - + + + @@ -47936,162 +47945,162 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -48102,15 +48111,15 @@ - + - + - + - + @@ -48131,14 +48140,14 @@ - + - + @@ -48156,18 +48165,18 @@ - + - + - + - + - + @@ -51206,7 +51215,7 @@ - + @@ -52003,185 +52012,185 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + @@ -52191,7 +52200,7 @@ - + @@ -52201,48 +52210,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -52259,58 +52268,58 @@ - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -52372,74 +52381,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + @@ -52462,18 +52477,18 @@ - + - + - + - + - + @@ -60425,7 +60440,7 @@ - + @@ -76798,21 +76813,21 @@ - + - + - + - + - + - + @@ -109235,354 +109250,357 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + + + + - + @@ -110233,15 +110251,15 @@ - + - + - + - + @@ -115398,20 +115416,23 @@ + + + - + - + - + - + - + @@ -116017,20 +116038,23 @@ + + + - + - + - + - + - + @@ -116392,45 +116416,45 @@ - - + + - - - - - + + + + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + @@ -123484,7 +123508,7 @@ - + @@ -123525,16 +123549,19 @@ - + - + - + - + + + + @@ -125138,7 +125165,7 @@ - + @@ -125172,6 +125199,9 @@ + + + @@ -129626,10 +129656,13 @@ - + - + + + + @@ -134656,10 +134689,10 @@ - + - + @@ -138712,25 +138745,25 @@ - - - + + + - - + + - - + + - - + + - - + + @@ -141078,16 +141111,16 @@ - - + + - + - + @@ -141118,200 +141151,200 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -142041,25 +142074,25 @@ - + - - - - - - + + + + + + - + - + - - - + + + @@ -142067,12 +142100,12 @@ - + - - - + + + @@ -142084,12 +142117,12 @@ - - + + - - + + @@ -142097,76 +142130,76 @@ - - + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - - - + + + + + - - + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + @@ -142623,38 +142656,38 @@ - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + @@ -154493,10 +154526,10 @@ - - - - + + + + @@ -154510,9 +154543,9 @@ - - - + + + @@ -154522,9 +154555,9 @@ - - - + + + @@ -154615,21 +154648,21 @@ - + - + - + - + - + - + @@ -154718,10 +154751,10 @@ - - - - + + + + @@ -154881,19 +154914,19 @@ - - - - - + + + + + - - - - - - + + + + + + @@ -156303,12 +156336,12 @@ - - + + - + - + @@ -173199,27 +173232,27 @@ - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + @@ -175791,6 +175824,17 @@ + + + + + + + + + + + @@ -175849,17 +175893,6 @@ - - - - - - - - - - - @@ -176730,7 +176763,7 @@ - + @@ -176833,6 +176866,9 @@ + + + @@ -176875,78 +176911,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -177093,18 +177129,6 @@ - - - - - - - - - - - - @@ -177125,6 +177149,18 @@ + + + + + + + + + + + + @@ -177171,6 +177207,19 @@ + + + + + + + + + + + + + @@ -177182,6 +177231,15 @@ + + + + + + + + + @@ -177196,6 +177254,22 @@ + + + + + + + + + + + + + + + + @@ -177242,30 +177316,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + @@ -177375,132 +177486,53 @@ - + - + - - + + + + + - + - + - + - + - + - - - - + - + - + - + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -177508,6 +177540,18 @@ + + + + + + + + + + + + @@ -177516,20 +177560,40 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -177571,31 +177635,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -178334,81 +178373,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -178518,46 +178557,49 @@ - + - + - - + + + + + - + - + - + - + - + - - - - + - + - + - + - - + + + + + @@ -179180,7 +179222,7 @@ - + @@ -179283,6 +179325,9 @@ + + + @@ -180736,7 +180781,7 @@ - + @@ -180761,6 +180806,9 @@ + + + @@ -180908,30 +180956,30 @@ - + - + - + - + - + - + - + - + - +