-
Notifications
You must be signed in to change notification settings - Fork 214
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix multi-unquicken bug for same CodeItems
Newly introduced CompactDex is deduplicating not only String data, but all types of items in data section, including CodeItems. Therefore, if the same CodeItem is linked with more than one methods (e.g. simple type of constructors) the Cdex is using the same code offset, which should be decompiled once. So we need to maintain a history with all the visited CodeItems so we check if already decompiled. Otherwise, the QuickenData streams will get corrupted since it will be consumed in wrong offsets. Currently this is achieved via simple hashset implementation that was forked from the https://github.com/avsej/hashset.c. Hashing the data pointers is good enough for now since we always operate against the already mapped file (all CodeItem offsets calculated from loaded file virtual address). Signed-off-by: Anestis Bechtsoudis <anestis@census-labs.com>
- Loading branch information
Showing
6 changed files
with
269 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * Copyright 2012 Couchbase, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include "hashset.h" | ||
| #include <assert.h> | ||
|
|
||
| static const unsigned int prime_1 = 73; | ||
| static const unsigned int prime_2 = 5009; | ||
|
|
||
| hashset_t hashset_create() { | ||
| hashset_t set = calloc(1, sizeof(struct hashset_st)); | ||
|
|
||
| if (set == NULL) { | ||
| return NULL; | ||
| } | ||
| set->nbits = 3; | ||
| set->capacity = (size_t)(1 << set->nbits); | ||
| set->mask = set->capacity - 1; | ||
| set->items = calloc(set->capacity, sizeof(size_t)); | ||
| if (set->items == NULL) { | ||
| hashset_destroy(set); | ||
| return NULL; | ||
| } | ||
| set->nitems = 0; | ||
| set->n_deleted_items = 0; | ||
| return set; | ||
| } | ||
|
|
||
| size_t hashset_num_items(hashset_t set) { return set->nitems; } | ||
|
|
||
| void hashset_destroy(hashset_t set) { | ||
| if (set) { | ||
| free(set->items); | ||
| } | ||
| free(set); | ||
| } | ||
|
|
||
| static int hashset_add_member(hashset_t set, void *item) { | ||
| size_t value = (size_t)item; | ||
| size_t ii; | ||
|
|
||
| if (value == 0 || value == 1) { | ||
| return -1; | ||
| } | ||
|
|
||
| ii = set->mask & (prime_1 * value); | ||
|
|
||
| while (set->items[ii] != 0 && set->items[ii] != 1) { | ||
| if (set->items[ii] == value) { | ||
| return 0; | ||
| } else { | ||
| /* search free slot */ | ||
| ii = set->mask & (ii + prime_2); | ||
| } | ||
| } | ||
| set->nitems++; | ||
| if (set->items[ii] == 1) { | ||
| set->n_deleted_items--; | ||
| } | ||
| set->items[ii] = value; | ||
| return 1; | ||
| } | ||
|
|
||
| static void maybe_rehash(hashset_t set) { | ||
| size_t *old_items; | ||
| size_t old_capacity, ii; | ||
|
|
||
| if (set->nitems + set->n_deleted_items >= (double)set->capacity * 0.85) { | ||
| old_items = set->items; | ||
| old_capacity = set->capacity; | ||
| set->nbits++; | ||
| set->capacity = (size_t)(1 << set->nbits); | ||
| set->mask = set->capacity - 1; | ||
| set->items = calloc(set->capacity, sizeof(size_t)); | ||
| set->nitems = 0; | ||
| set->n_deleted_items = 0; | ||
| assert(set->items); | ||
| for (ii = 0; ii < old_capacity; ii++) { | ||
| hashset_add_member(set, (void *)old_items[ii]); | ||
| } | ||
| free(old_items); | ||
| } | ||
| } | ||
|
|
||
| int hashset_add(hashset_t set, void *item) { | ||
| int rv = hashset_add_member(set, item); | ||
| maybe_rehash(set); | ||
| return rv; | ||
| } | ||
|
|
||
| int hashset_remove(hashset_t set, void *item) { | ||
| size_t value = (size_t)item; | ||
| size_t ii = set->mask & (prime_1 * value); | ||
|
|
||
| while (set->items[ii] != 0) { | ||
| if (set->items[ii] == value) { | ||
| set->items[ii] = 1; | ||
| set->nitems--; | ||
| set->n_deleted_items++; | ||
| return 1; | ||
| } else { | ||
| ii = set->mask & (ii + prime_2); | ||
| } | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| int hashset_is_member(hashset_t set, void *item) { | ||
| size_t value = (size_t)item; | ||
| size_t ii = set->mask & (prime_1 * value); | ||
|
|
||
| while (set->items[ii] != 0) { | ||
| if (set->items[ii] == value) { | ||
| return 1; | ||
| } else { | ||
| ii = set->mask & (ii + prime_2); | ||
| } | ||
| } | ||
| return 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Copyright 2012 Couchbase, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #ifndef HASHSET_H | ||
| #define HASHSET_H 1 | ||
|
|
||
| #include <stdlib.h> | ||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif | ||
|
|
||
| struct hashset_st { | ||
| size_t nbits; | ||
| size_t mask; | ||
|
|
||
| size_t capacity; | ||
| size_t *items; | ||
| size_t nitems; | ||
| size_t n_deleted_items; | ||
| }; | ||
|
|
||
| typedef struct hashset_st *hashset_t; | ||
|
|
||
| /* create hashset instance */ | ||
| hashset_t hashset_create(void); | ||
|
|
||
| /* destroy hashset instance */ | ||
| void hashset_destroy(hashset_t set); | ||
|
|
||
| size_t hashset_num_items(hashset_t set); | ||
|
|
||
| /* add item into the hashset. | ||
| * | ||
| * @note 0 and 1 is special values, meaning nil and deleted items. the | ||
| * function will return -1 indicating error. | ||
| * | ||
| * returns zero if the item already in the set and non-zero otherwise | ||
| */ | ||
| int hashset_add(hashset_t set, void *item); | ||
|
|
||
| /* remove item from the hashset | ||
| * | ||
| * returns non-zero if the item was removed and zero if the item wasn't | ||
| * exist | ||
| */ | ||
| int hashset_remove(hashset_t set, void *item); | ||
|
|
||
| /* check if existence of the item | ||
| * | ||
| * returns non-zero if the item exists and zero otherwise | ||
| */ | ||
| int hashset_is_member(hashset_t set, void *item); | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters