diff --git a/Ghidra/Processors/MIPS/data/languages/mips.sinc b/Ghidra/Processors/MIPS/data/languages/mips.sinc index d9f24e1ad1..20d687da48 100644 --- a/Ghidra/Processors/MIPS/data/languages/mips.sinc +++ b/Ghidra/Processors/MIPS/data/languages/mips.sinc @@ -613,9 +613,9 @@ define token instr(32) ac = (11,12) bp = (11,12) bit10 = (10,10) - svrs_s0 = (10,10) + svrs_s0 = (11,11) spec2 = (9,10) - svrs_s1 = (9,9) + svrs_s1 = (10,10) spec3 = (8,10) simmed9 = (7,15) zero2 = (7,10) diff --git a/Ghidra/Processors/MIPS/data/languages/mips16.sinc b/Ghidra/Processors/MIPS/data/languages/mips16.sinc index 0844ddf1b9..c3673bc6a7 100644 --- a/Ghidra/Processors/MIPS/data/languages/mips16.sinc +++ b/Ghidra/Processors/MIPS/data/languages/mips16.sinc @@ -12,14 +12,14 @@ define token m16instr (16) m16_op=(11,15) - m16_rd0_0 = (11,15) - m16_rd0_1 = (11,15) - m16_rd0_2 = (11,15) - m16_rd0_3 = (11,15) - m16_rd0_4 = (11,15) - m16_rd0_5 = (11,15) - m16_rd0_6 = (11,15) - m16_rd0_7 = (11,15) + m16_rd0_0 = (0,4) + m16_rd0_1 = (0,4) + m16_rd0_2 = (0,4) + m16_rd0_3 = (0,4) + m16_rd0_4 = (0,4) + m16_rd0_5 = (0,4) + m16_rd0_6 = (0,4) + m16_rd0_7 = (0,4) m16_i_imm=(0,4) m16_rx=(8,10) m16_rxa=(8,10) diff --git a/Ghidra/Processors/MIPS/data/languages/mips32Instructions.sinc b/Ghidra/Processors/MIPS/data/languages/mips32Instructions.sinc index a5e59dcad9..c66bad986d 100644 --- a/Ghidra/Processors/MIPS/data/languages/mips32Instructions.sinc +++ b/Ghidra/Processors/MIPS/data/languages/mips32Instructions.sinc @@ -1949,7 +1949,7 @@ svFramesize: ,val is svrs_frame_hi=0 & svrs_frame_low=0 [val = 128; ] {expo svFramesize: ,val is svrs_frame_hi & svrs_frame_low [val = ((svrs_frame_hi << 4) | svrs_frame_low) << 3;] {export *[const]:2 val;} -:save svRa^svXsregs^svAregs^svFramesize is $(AMODE) & REL6=1 & prime=0x1c & fct=0x1f & save=0x01 & svRa & svXsregs & svAregs & svStat & svFramesize { +:save svRa^svXsregs^svAregs^svFramesize is $(AMODE) & prime=0x1c & fct=0x1f & save=0x01 & svRa & svXsregs & svAregs & svStat & svFramesize { tsp = sp; build svAregs; build svRa; @@ -1961,7 +1961,7 @@ svFramesize: ,val is svrs_frame_hi & svrs_frame_low [val = ((svrs_frame_hi sp = sp - zext(tmp); } -:restore rsRa^rsXsregs^rsStat^svFramesize is $(AMODE) & REL6=1 & prime=0x1c & fct=0x1f & save=0x00 & rsRa & rsXsregs & rsStat & svFramesize { +:restore rsRa^rsXsregs^rsStat^svFramesize is $(AMODE) & prime=0x1c & fct=0x1f & save=0x00 & rsRa & rsXsregs & rsStat & svFramesize { build svFramesize; tmp:2 = svFramesize; diff --git a/Ghidra/RuntimeScripts/Linux/support/gdbGADPServerRun b/Ghidra/RuntimeScripts/Linux/support/gdbGADPServerRun deleted file mode 100755 index c6305e3a4d..0000000000 --- a/Ghidra/RuntimeScripts/Linux/support/gdbGADPServerRun +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -#---------------------------------------- -# GADP Server launch -#---------------------------------------- - -# Maximum heap memory may be changed if default is inadequate. This will generally be up to 1/4 of -# the physical memory available to the OS. Uncomment MAXMEM setting if non-default value is needed. -#MAXMEM=2G - -# Resolve symbolic link if present and get the directory this script lives in. -# NOTE: "readlink -f" is best but works on Linux only, "readlink" will only work if your PWD -# contains the link you are calling (which is the best we can do on macOS), and the "echo" is the -# fallback, which doesn't attempt to do anything with links. -SCRIPT_FILE="$(readlink -f "$0" 2>/dev/null || readlink "$0" 2>/dev/null || echo "$0")" -SCRIPT_DIR="$(dirname -- "$SCRIPT_FILE")" -# Launch Ghidra -"${SCRIPT_DIR}"/launch.sh fg jdk GdbAgent "${MAXMEM}" "" agent.gdb.gadp.GdbGadpServerLaunchShim $@ diff --git a/Ghidra/RuntimeScripts/Windows/support/dbgengGADPServerRun.bat b/Ghidra/RuntimeScripts/Windows/support/dbgengGADPServerRun.bat deleted file mode 100644 index 820daf39cb..0000000000 --- a/Ghidra/RuntimeScripts/Windows/support/dbgengGADPServerRun.bat +++ /dev/null @@ -1,26 +0,0 @@ -:: ### -:: IP: GHIDRA -:: -:: 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. -:: ## -:: GADP Server launch - -@echo off -setlocal - -:: Maximum heap memory may be changed if default is inadequate. This will generally be up to 1/4 of -:: the physical memory available to the OS. Uncomment MAXMEM setting if non-default value is needed. -::set MAXMEM=2G - -call "%~dp0launch.bat" fg jdk DbgEngAgent "%MAXMEM%" "" agent.dbgeng.gadp.DbgEngGadpServerLaunchShim %* - diff --git a/Ghidra/RuntimeScripts/Windows/support/dbgmodelGADPServerRun.bat b/Ghidra/RuntimeScripts/Windows/support/dbgmodelGADPServerRun.bat deleted file mode 100644 index 2106c0bf22..0000000000 --- a/Ghidra/RuntimeScripts/Windows/support/dbgmodelGADPServerRun.bat +++ /dev/null @@ -1,26 +0,0 @@ -:: ### -:: IP: GHIDRA -:: -:: 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. -:: ## -:: GADP Server launch - -@echo off -setlocal - -:: Maximum heap memory may be changed if default is inadequate. This will generally be up to 1/4 of -:: the physical memory available to the OS. Uncomment MAXMEM setting if non-default value is needed. -::set MAXMEM=2G - -call "%~dp0launch.bat" fg jdk DbgEngAgent "%MAXMEM%" "" agent.dbgmodel.gadp.DbgModelGadpServerLaunchShim %* -