-
Notifications
You must be signed in to change notification settings - Fork 712
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2861 from acrowthe/add_constant_dynamic_slot_iter…
…ator WIP: Add constant dynamic slot iterator
- Loading branch information
Showing
11 changed files
with
480 additions
and
46 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
|
|
||
| /******************************************************************************* | ||
| * Copyright (c) 1991, 2018 IBM Corp. and others | ||
| * | ||
| * This program and the accompanying materials are made available under | ||
| * the terms of the Eclipse Public License 2.0 which accompanies this | ||
| * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * or the Apache License, Version 2.0 which accompanies this distribution and | ||
| * is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following | ||
| * Secondary Licenses when the conditions for such availability set | ||
| * forth in the Eclipse Public License, v. 2.0 are satisfied: GNU | ||
| * General Public License, version 2 with the GNU Classpath | ||
| * Exception [1] and GNU General Public License, version 2 with the | ||
| * OpenJDK Assembly Exception [2]. | ||
| * | ||
| * [1] https://www.gnu.org/software/classpath/license.html | ||
| * [2] http://openjdk.java.net/legal/assembly-exception.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception | ||
| *******************************************************************************/ | ||
|
|
||
| /** | ||
| * @file | ||
| * @ingroup GC_Structs | ||
| */ | ||
|
|
||
| #include "j9.h" | ||
| #include "ModronAssertions.h" | ||
|
|
||
| #include "ConstantDynamicSlotIterator.hpp" | ||
|
|
||
|
|
||
| /** | ||
| * Scan the current constant dynamic slot | ||
| * @return slot value if it is not NULL | ||
| * @return exception otherwise | ||
| */ | ||
| j9object_t* | ||
| GC_ConstantDynamicSlotIterator::nextSlot(j9object_t *slotPtr) { | ||
| j9object_t *result; | ||
| switch (_condySlotState) { | ||
| case condy_slot_value: | ||
| result = &(((J9RAMConstantDynamicRef *) slotPtr)->value); | ||
| _condySlotState = condy_slot_exception; | ||
| break; | ||
| case condy_slot_exception: | ||
| result = &(((J9RAMConstantDynamicRef *) slotPtr)->exception); | ||
| _condySlotState = condy_slot_terminator; | ||
| break; | ||
| case condy_slot_terminator: | ||
| result = NULL; | ||
| _condySlotState = condy_slot_value; | ||
| break; | ||
| default: | ||
| Assert_MM_unreachable(); | ||
| break; | ||
| } | ||
| return result; | ||
| } |
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,58 @@ | ||
|
|
||
| /******************************************************************************* | ||
| * Copyright (c) 1991, 2018 IBM Corp. and others | ||
| * | ||
| * This program and the accompanying materials are made available under | ||
| * the terms of the Eclipse Public License 2.0 which accompanies this | ||
| * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * or the Apache License, Version 2.0 which accompanies this distribution and | ||
| * is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following | ||
| * Secondary Licenses when the conditions for such availability set | ||
| * forth in the Eclipse Public License, v. 2.0 are satisfied: GNU | ||
| * General Public License, version 2 with the GNU Classpath | ||
| * Exception [1] and GNU General Public License, version 2 with the | ||
| * OpenJDK Assembly Exception [2]. | ||
| * | ||
| * [1] https://www.gnu.org/software/classpath/license.html | ||
| * [2] http://openjdk.java.net/legal/assembly-exception.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception | ||
| *******************************************************************************/ | ||
|
|
||
| /** | ||
| * @file | ||
| * @ingroup GC_Structs | ||
| */ | ||
|
|
||
| #if !defined(CONSTANTDYNAMICSLOTITERATOR_HPP_) | ||
| #define CONSTANTDYNAMICSLOTITERATOR_HPP_ | ||
|
|
||
| #include "j9.h" | ||
| #include "ModronAssertions.h" | ||
|
|
||
|
|
||
| /** | ||
| * Iterate over a constant dynamic object reference within the constant pool of a class. | ||
| * | ||
| * @see GC_ConstantPoolClassSlotIterator | ||
| * @ingroup GC_Structs | ||
| */ | ||
| class GC_ConstantDynamicSlotIterator { | ||
| private: | ||
| typedef enum { | ||
| condy_slot_value, | ||
| condy_slot_exception, | ||
| condy_slot_terminator | ||
| } CondySlotState; | ||
| CondySlotState _condySlotState; | ||
|
|
||
| public: | ||
| GC_ConstantDynamicSlotIterator() : | ||
| _condySlotState(condy_slot_value) | ||
| { }; | ||
|
|
||
| j9object_t *nextSlot(j9object_t *slotPtr); | ||
| }; | ||
| #endif /* CONSTANTDYNAMICSLOTITERATOR_HPP_ */ |
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
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
29 changes: 29 additions & 0 deletions
29
test/functional/Java11andUp/src/org/openj9/test/condy/CondyClassLoader.java
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,29 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2018, 2018 IBM Corp. and others | ||
| * | ||
| * This program and the accompanying materials are made available under | ||
| * the terms of the Eclipse Public License 2.0 which accompanies this | ||
| * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * or the Apache License, Version 2.0 which accompanies this distribution and | ||
| * is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * This Source Code may also be made available under the following | ||
| * Secondary Licenses when the conditions for such availability set | ||
| * forth in the Eclipse Public License, v. 2.0 are satisfied: GNU | ||
| * General Public License, version 2 with the GNU Classpath | ||
| * Exception [1] and GNU General Public License, version 2 with the | ||
| * OpenJDK Assembly Exception [2]. | ||
| * | ||
| * [1] https://www.gnu.org/software/classpath/license.html | ||
| * [2] http://openjdk.java.net/legal/assembly-exception.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception | ||
| *******************************************************************************/ | ||
| package org.openj9.test.condy; | ||
|
|
||
|
|
||
| public class CondyClassLoader extends ClassLoader { | ||
| public Class<?> load(String name, byte[] bytes) { | ||
| return (Class<?>) defineClass(name, bytes, 0, bytes.length); | ||
| } | ||
| } |
Oops, something went wrong.