changed: don't record parameter name mapping in symbol mapping file. we consider this is unnecessary.
parent
18be3c9f24
commit
a4014fe829
|
@ -10,8 +10,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus
|
||||||
|
|
||||||
void AddPreservedName(MethodDef methodDef, string name);
|
void AddPreservedName(MethodDef methodDef, string name);
|
||||||
|
|
||||||
void AddPreservedName(ParamDef paramDef, string name);
|
|
||||||
|
|
||||||
void AddPreservedName(FieldDef fieldDef, string name);
|
void AddPreservedName(FieldDef fieldDef, string name);
|
||||||
|
|
||||||
void AddPreservedName(PropertyDef propertyDef, string name);
|
void AddPreservedName(PropertyDef propertyDef, string name);
|
||||||
|
|
|
@ -36,11 +36,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus.NameMakers
|
||||||
GetNameScope(methodDef.DeclaringType).AddPreservedName(name);
|
GetNameScope(methodDef.DeclaringType).AddPreservedName(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddPreservedName(ParamDef paramDef, string name)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AddPreservedName(FieldDef fieldDef, string name)
|
public void AddPreservedName(FieldDef fieldDef, string name)
|
||||||
{
|
{
|
||||||
GetNameScope(fieldDef.DeclaringType).AddPreservedName(name);
|
GetNameScope(fieldDef.DeclaringType).AddPreservedName(name);
|
||||||
|
|
|
@ -42,8 +42,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus
|
||||||
public RenameStatus status;
|
public RenameStatus status;
|
||||||
public string signature;
|
public string signature;
|
||||||
public string newName;
|
public string newName;
|
||||||
|
|
||||||
public List<RenameMappingMethodParam> parameters = new List<RenameMappingMethodParam>();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private class RenameMappingMethodParam
|
private class RenameMappingMethodParam
|
||||||
|
@ -320,34 +318,9 @@ namespace Obfuz.ObfusPasses.SymbolObfus
|
||||||
newName = newName,
|
newName = newName,
|
||||||
status = RenameStatus.Renamed,
|
status = RenameStatus.Renamed,
|
||||||
};
|
};
|
||||||
foreach (XmlNode node in ele.ChildNodes)
|
|
||||||
{
|
|
||||||
if (!(node is XmlElement c))
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
switch (node.Name)
|
|
||||||
{
|
|
||||||
case "param": LoadMethodParamMapping(c, rmm); break;
|
|
||||||
default: throw new System.Exception($"unknown node name:{node.Name}, expect 'param'");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
type.methods.Add(signature, rmm);
|
type.methods.Add(signature, rmm);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void LoadMethodParamMapping(XmlElement ele, RenameMappingMethod method)
|
|
||||||
{
|
|
||||||
string index = ele.Attributes["index"].Value;
|
|
||||||
string newName = ele.Attributes["newName"].Value;
|
|
||||||
var rmp = new RenameMappingMethodParam
|
|
||||||
{
|
|
||||||
index = int.Parse(index),
|
|
||||||
newName = newName,
|
|
||||||
status = RenameStatus.Renamed,
|
|
||||||
};
|
|
||||||
method.parameters.Add(rmp);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void LoadFieldMapping(XmlElement ele, RenameMappingType type)
|
private void LoadFieldMapping(XmlElement ele, RenameMappingType type)
|
||||||
{
|
{
|
||||||
string signature = ele.Attributes["signature"].Value;
|
string signature = ele.Attributes["signature"].Value;
|
||||||
|
@ -577,11 +550,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus
|
||||||
var methodNode = typeEle.OwnerDocument.CreateElement("method");
|
var methodNode = typeEle.OwnerDocument.CreateElement("method");
|
||||||
methodNode.SetAttribute("signature", signature);
|
methodNode.SetAttribute("signature", signature);
|
||||||
methodNode.SetAttribute("newName", method.newName);
|
methodNode.SetAttribute("newName", method.newName);
|
||||||
//methodNode.SetAttribute("status", record != null ? record.status.ToString() : RenameStatus.NotRenamed.ToString());
|
|
||||||
foreach (RenameMappingMethodParam param in method.parameters)
|
|
||||||
{
|
|
||||||
WriteMethodParamMapping(methodNode, param);
|
|
||||||
}
|
|
||||||
typeEle.AppendChild(methodNode);
|
typeEle.AppendChild(methodNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -598,15 +566,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus
|
||||||
methodEle.AppendChild(paramNode);
|
methodEle.AppendChild(paramNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void WriteMethodParamMapping(XmlElement methodEle, RenameMappingMethodParam param)
|
|
||||||
{
|
|
||||||
var paramNode = methodEle.OwnerDocument.CreateElement("param");
|
|
||||||
paramNode.SetAttribute("index", param.index.ToString());
|
|
||||||
paramNode.SetAttribute("newName", param.newName);
|
|
||||||
//paramNode.SetAttribute("status", record.status.ToString());
|
|
||||||
methodEle.AppendChild(paramNode);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AddRename(ModuleDef mod, string newName)
|
public void AddRename(ModuleDef mod, string newName)
|
||||||
{
|
{
|
||||||
RenameRecord record = _modRenames[mod];
|
RenameRecord record = _modRenames[mod];
|
||||||
|
@ -628,13 +587,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus
|
||||||
record.newName = newName;
|
record.newName = newName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddRename(ParamDef paramDef, string newName)
|
|
||||||
{
|
|
||||||
RenameRecord record = _paramRenames[paramDef];
|
|
||||||
record.status = RenameStatus.Renamed;
|
|
||||||
record.newName = newName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void InitAndAddRename(VirtualMethodGroup methodGroup, string newName)
|
public void InitAndAddRename(VirtualMethodGroup methodGroup, string newName)
|
||||||
{
|
{
|
||||||
RenameRecord methodRecord = _methodRenames[methodGroup.methods[0]];
|
RenameRecord methodRecord = _methodRenames[methodGroup.methods[0]];
|
||||||
|
|
|
@ -717,7 +717,6 @@ namespace Obfuz.ObfusPasses.SymbolObfus
|
||||||
private void Rename(ParamDef param)
|
private void Rename(ParamDef param)
|
||||||
{
|
{
|
||||||
string newName = _nameMaker.GetNewName(param, param.Name);
|
string newName = _nameMaker.GetNewName(param, param.Name);
|
||||||
_renameRecordMap.AddRename(param, newName);
|
|
||||||
param.Name = newName;
|
param.Name = newName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue