Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -44,8 +44,8 @@ namespace Mono.ILASM {
private Target target = Target.Exe;
private string target_string = "exe";
private bool show_tokens = false;
private bool show_method_def = false;
private bool show_method_ref = false;
// private bool show_method_def = false;
// private bool show_method_ref = false;
private bool show_parser = false;
private bool scan_only = false;
private bool debugging_info = false;
@@ -189,7 +189,7 @@ namespace Mono.ILASM {
ie.FilePath = file_path;
ie.Location = scanner.Reader.Location;
throw;
} catch (Exception e){
} catch (Exception){
Console.Write ("{0} ({1}, {2}): ",file_path, scanner.Reader.Location.line, scanner.Reader.Location.column);
throw;
} finally {
@@ -277,10 +277,10 @@ namespace Mono.ILASM {
show_tokens = true;
break;
case "show_method_def":
show_method_def = true;
// show_method_def = true;
break;
case "show_method_ref":
show_method_ref = true;
// show_method_ref = true;
break;
case "show_parser":
show_parser = true;

View File

@@ -4,7 +4,7 @@ include ../build/rules.make
PROGRAM = ilasm.exe
BUILT_SOURCES = ILParser.cs
LOCAL_MCS_FLAGS = /lib:../class/lib/$(PROFILE) /r:../class/lib/$(PROFILE)/PEAPI.dll /r:Mono.CompilerServices.SymbolWriter.dll /r:Mono.Security.dll
LIB_REFS = PEAPI Mono.CompilerServices.SymbolWriter Mono.Security
CLEAN_FILES = parser/y.output

View File

@@ -16,7 +16,6 @@ namespace Mono.ILASM {
public abstract class Report {
private static int error_count;
private static int mark_count;
private static bool quiet;
/* Current file being processed */
private static string file_path;

View File

@@ -29,7 +29,7 @@ namespace Mono.ILASM {
private PEFile pefile;
private ExternAssembly current_assemblyref;
private ExternModule current_moduleref;
// private ExternModule current_moduleref;
private string current_namespace;
private TypeDef current_typedef;
private MethodDef current_methoddef;
@@ -61,7 +61,6 @@ namespace Mono.ILASM {
private long stack_reserve;
private string output_file;
private string debug_file;
private bool is_dll;
private bool entry_point;
@@ -119,9 +118,9 @@ namespace Mono.ILASM {
get { return current_assemblyref; }
}
public ExternModule CurrentModuleRef {
get { return current_moduleref; }
}
// public ExternModule CurrentModuleRef {
// get { return current_moduleref; }
// }
public ICustomAttrTarget CurrentCustomAttrTarget {
get { return current_customattrtarget; }

View File

@@ -15,14 +15,14 @@ namespace Mono.ILASM {
public class DataDef {
private string name;
private bool is_tls;
private PEAPI.DataSegment segment;
private PEAPI.Constant constant;
public DataDef (string name, bool is_tls)
public DataDef (string name, PEAPI.DataSegment segment)
{
this.name = name;
this.is_tls = is_tls;
this.segment = segment;
}
public PEAPI.Constant PeapiConstant {

View File

@@ -23,7 +23,7 @@ namespace Mono.ILASM {
private PEAPI.NativeType native_type;
private bool offset_set;
private bool datavalue_set;
// private bool datavalue_set;
private bool value_set;
private bool is_resolved;
@@ -40,7 +40,7 @@ namespace Mono.ILASM {
this.type = type;
offset_set = false;
datavalue_set = false;
// datavalue_set = false;
value_set = false;
at_data_id = null;

View File

@@ -19,7 +19,7 @@ namespace Mono.ILASM {
private BaseClassRef class_ref;
private PEAPI.GenericTypeInst p_gen_inst;
private bool is_valuetypeinst;
const bool is_valuetypeinst = false;
private GenericArguments gen_args;
private bool is_added; /* Added to PEFile (to TypeSpec table) ? */
/* Note: Using static hashtable here as GenericTypeInsts is not cached */

View File

@@ -1 +1 @@
63ddee82bfa286db0e183495ef80d6a93e4d5b90
c12eeaf978be47f106f6620198cbd223988e3ab2

View File

@@ -195,6 +195,7 @@ namespace Mono.ILASM {
keywords ["internalcall"] = new ILToken (Token.K_INTERNALCALL, "internalcall");
keywords ["synchronized"] = new ILToken (Token.K_SYNCHRONIZED, "synchronized");
keywords ["noinlining"] = new ILToken (Token.K_NOINLINING, "noinlining");
keywords ["nooptimization"] = new ILToken (Token.K_NOOPTIMIZATION, "nooptimization");
keywords ["custom"] = new ILToken (Token.K_CUSTOM, "custom");
keywords ["fixed"] = new ILToken (Token.K_FIXED, "fixed");
keywords ["sysstring"] = new ILToken (Token.K_SYSSTRING, "sysstring");

View File

@@ -56,10 +56,11 @@ namespace Mono.ILASM {
case OperandType.InlineNone:
token = Token.INSTR_NONE;
break;
#pragma warning disable 618
case OperandType.InlinePhi:
token = Token.INSTR_PHI;
break;
#pragma warning restore 618
case OperandType.InlineR:
case OperandType.ShortInlineR:

View File

@@ -0,0 +1,2 @@
.assembly extern mscorlib { }
.data cil test = bytearray ( 01 02 03 )