Merge branch

'GP-5449_ryanmkurtz_PR-7868_Lehona_tricore_fix_relocation_24REL' into
patch (Closes #7868)
This commit is contained in:
Ryan Kurtz 2025-03-04 13:03:47 -05:00
commit aa0753dbef

View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -355,8 +355,7 @@ public class Tricore_ElfRelocationHandler
*/ */
private int relocate_relB(Memory memory, Address relocationAddress, long rv) private int relocate_relB(Memory memory, Address relocationAddress, long rv)
throws MemoryAccessException { throws MemoryAccessException {
// TODO ff000000..00fffffe? long mask = 0x00000001L;
long mask = 0xfffffffeL;
long val = ~mask & rv; long val = ~mask & rv;
int iw = memory.getInt(relocationAddress) & 0xff; int iw = memory.getInt(relocationAddress) & 0xff;
iw |= ((val & 0x1fffe) << 15); iw |= ((val & 0x1fffe) << 15);