diff options
author | Mike Pall <mike> | 2020-01-20 23:34:21 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2020-01-20 23:34:21 +0100 |
commit | 87b111f0fe18788d38dbafd9d768d720f77f052b (patch) | |
tree | 0b31f7728ccfee8426506cc04528471e362fef75 /dynasm | |
parent | 981ec8d2aac5cac76bdedd4015b6d32447b29597 (diff) | |
parent | 38a5ed4b434618662372c0c1665ed08782f5faa5 (diff) | |
download | luajit-87b111f0fe18788d38dbafd9d768d720f77f052b.tar.gz luajit-87b111f0fe18788d38dbafd9d768d720f77f052b.tar.bz2 luajit-87b111f0fe18788d38dbafd9d768d720f77f052b.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'dynasm')
-rw-r--r-- | dynasm/dasm_arm.h | 2 | ||||
-rw-r--r-- | dynasm/dasm_arm.lua | 2 | ||||
-rw-r--r-- | dynasm/dasm_arm64.h | 2 | ||||
-rw-r--r-- | dynasm/dasm_arm64.lua | 2 | ||||
-rw-r--r-- | dynasm/dasm_mips.h | 2 | ||||
-rw-r--r-- | dynasm/dasm_mips.lua | 4 | ||||
-rw-r--r-- | dynasm/dasm_mips64.lua | 2 | ||||
-rw-r--r-- | dynasm/dasm_ppc.h | 2 | ||||
-rw-r--r-- | dynasm/dasm_ppc.lua | 2 | ||||
-rw-r--r-- | dynasm/dasm_proto.h | 2 | ||||
-rw-r--r-- | dynasm/dasm_x64.lua | 2 | ||||
-rw-r--r-- | dynasm/dasm_x86.h | 2 | ||||
-rw-r--r-- | dynasm/dasm_x86.lua | 2 | ||||
-rw-r--r-- | dynasm/dynasm.lua | 4 |
14 files changed, 16 insertions, 16 deletions
diff --git a/dynasm/dasm_arm.h b/dynasm/dasm_arm.h index 1d404ccd..b0df914e 100644 --- a/dynasm/dasm_arm.h +++ b/dynasm/dasm_arm.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** DynASM ARM encoding engine. | 2 | ** DynASM ARM encoding engine. |
3 | ** Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. | 4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. |
5 | */ | 5 | */ |
6 | 6 | ||
diff --git a/dynasm/dasm_arm.lua b/dynasm/dasm_arm.lua index 32f595af..164980a1 100644 --- a/dynasm/dasm_arm.lua +++ b/dynasm/dasm_arm.lua | |||
@@ -1,7 +1,7 @@ | |||
1 | ------------------------------------------------------------------------------ | 1 | ------------------------------------------------------------------------------ |
2 | -- DynASM ARM module. | 2 | -- DynASM ARM module. |
3 | -- | 3 | -- |
4 | -- Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
5 | -- See dynasm.lua for full copyright notice. | 5 | -- See dynasm.lua for full copyright notice. |
6 | ------------------------------------------------------------------------------ | 6 | ------------------------------------------------------------------------------ |
7 | 7 | ||
diff --git a/dynasm/dasm_arm64.h b/dynasm/dasm_arm64.h index ff21236d..3455981f 100644 --- a/dynasm/dasm_arm64.h +++ b/dynasm/dasm_arm64.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** DynASM ARM64 encoding engine. | 2 | ** DynASM ARM64 encoding engine. |
3 | ** Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. | 4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. |
5 | */ | 5 | */ |
6 | 6 | ||
diff --git a/dynasm/dasm_arm64.lua b/dynasm/dasm_arm64.lua index 8a5f735d..d5640842 100644 --- a/dynasm/dasm_arm64.lua +++ b/dynasm/dasm_arm64.lua | |||
@@ -1,7 +1,7 @@ | |||
1 | ------------------------------------------------------------------------------ | 1 | ------------------------------------------------------------------------------ |
2 | -- DynASM ARM64 module. | 2 | -- DynASM ARM64 module. |
3 | -- | 3 | -- |
4 | -- Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
5 | -- See dynasm.lua for full copyright notice. | 5 | -- See dynasm.lua for full copyright notice. |
6 | ------------------------------------------------------------------------------ | 6 | ------------------------------------------------------------------------------ |
7 | 7 | ||
diff --git a/dynasm/dasm_mips.h b/dynasm/dasm_mips.h index 7d06aa72..143c3cbe 100644 --- a/dynasm/dasm_mips.h +++ b/dynasm/dasm_mips.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** DynASM MIPS encoding engine. | 2 | ** DynASM MIPS encoding engine. |
3 | ** Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. | 4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. |
5 | */ | 5 | */ |
6 | 6 | ||
diff --git a/dynasm/dasm_mips.lua b/dynasm/dasm_mips.lua index ccdc53cd..3e41df52 100644 --- a/dynasm/dasm_mips.lua +++ b/dynasm/dasm_mips.lua | |||
@@ -1,7 +1,7 @@ | |||
1 | ------------------------------------------------------------------------------ | 1 | ------------------------------------------------------------------------------ |
2 | -- DynASM MIPS32/MIPS64 module. | 2 | -- DynASM MIPS32/MIPS64 module. |
3 | -- | 3 | -- |
4 | -- Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
5 | -- See dynasm.lua for full copyright notice. | 5 | -- See dynasm.lua for full copyright notice. |
6 | ------------------------------------------------------------------------------ | 6 | ------------------------------------------------------------------------------ |
7 | 7 | ||
@@ -14,7 +14,7 @@ local _info = { | |||
14 | description = "DynASM MIPS32/MIPS64 module", | 14 | description = "DynASM MIPS32/MIPS64 module", |
15 | version = "1.4.0", | 15 | version = "1.4.0", |
16 | vernum = 10400, | 16 | vernum = 10400, |
17 | release = "2016-05-24", | 17 | release = "2020-01-20", |
18 | author = "Mike Pall", | 18 | author = "Mike Pall", |
19 | license = "MIT", | 19 | license = "MIT", |
20 | } | 20 | } |
diff --git a/dynasm/dasm_mips64.lua b/dynasm/dasm_mips64.lua index 5636b23a..0aae291b 100644 --- a/dynasm/dasm_mips64.lua +++ b/dynasm/dasm_mips64.lua | |||
@@ -1,7 +1,7 @@ | |||
1 | ------------------------------------------------------------------------------ | 1 | ------------------------------------------------------------------------------ |
2 | -- DynASM MIPS64 module. | 2 | -- DynASM MIPS64 module. |
3 | -- | 3 | -- |
4 | -- Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
5 | -- See dynasm.lua for full copyright notice. | 5 | -- See dynasm.lua for full copyright notice. |
6 | ------------------------------------------------------------------------------ | 6 | ------------------------------------------------------------------------------ |
7 | -- This module just sets 64 bit mode for the combined MIPS/MIPS64 module. | 7 | -- This module just sets 64 bit mode for the combined MIPS/MIPS64 module. |
diff --git a/dynasm/dasm_ppc.h b/dynasm/dasm_ppc.h index 83fc030a..6e7cc7ab 100644 --- a/dynasm/dasm_ppc.h +++ b/dynasm/dasm_ppc.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** DynASM PPC/PPC64 encoding engine. | 2 | ** DynASM PPC/PPC64 encoding engine. |
3 | ** Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. | 4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. |
5 | */ | 5 | */ |
6 | 6 | ||
diff --git a/dynasm/dasm_ppc.lua b/dynasm/dasm_ppc.lua index 216f9259..20634e13 100644 --- a/dynasm/dasm_ppc.lua +++ b/dynasm/dasm_ppc.lua | |||
@@ -1,7 +1,7 @@ | |||
1 | ------------------------------------------------------------------------------ | 1 | ------------------------------------------------------------------------------ |
2 | -- DynASM PPC/PPC64 module. | 2 | -- DynASM PPC/PPC64 module. |
3 | -- | 3 | -- |
4 | -- Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
5 | -- See dynasm.lua for full copyright notice. | 5 | -- See dynasm.lua for full copyright notice. |
6 | -- | 6 | -- |
7 | -- Support for various extensions contributed by Caio Souza Oliveira. | 7 | -- Support for various extensions contributed by Caio Souza Oliveira. |
diff --git a/dynasm/dasm_proto.h b/dynasm/dasm_proto.h index 59d9e2b2..ba038e87 100644 --- a/dynasm/dasm_proto.h +++ b/dynasm/dasm_proto.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** DynASM encoding engine prototypes. | 2 | ** DynASM encoding engine prototypes. |
3 | ** Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. | 4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. |
5 | */ | 5 | */ |
6 | 6 | ||
diff --git a/dynasm/dasm_x64.lua b/dynasm/dasm_x64.lua index e8bdeb37..916d1d14 100644 --- a/dynasm/dasm_x64.lua +++ b/dynasm/dasm_x64.lua | |||
@@ -1,7 +1,7 @@ | |||
1 | ------------------------------------------------------------------------------ | 1 | ------------------------------------------------------------------------------ |
2 | -- DynASM x64 module. | 2 | -- DynASM x64 module. |
3 | -- | 3 | -- |
4 | -- Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
5 | -- See dynasm.lua for full copyright notice. | 5 | -- See dynasm.lua for full copyright notice. |
6 | ------------------------------------------------------------------------------ | 6 | ------------------------------------------------------------------------------ |
7 | -- This module just sets 64 bit mode for the combined x86/x64 module. | 7 | -- This module just sets 64 bit mode for the combined x86/x64 module. |
diff --git a/dynasm/dasm_x86.h b/dynasm/dasm_x86.h index dc14d883..edaddf54 100644 --- a/dynasm/dasm_x86.h +++ b/dynasm/dasm_x86.h | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | ** DynASM x86 encoding engine. | 2 | ** DynASM x86 encoding engine. |
3 | ** Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. | 4 | ** Released under the MIT license. See dynasm.lua for full copyright notice. |
5 | */ | 5 | */ |
6 | 6 | ||
diff --git a/dynasm/dasm_x86.lua b/dynasm/dasm_x86.lua index 39124d5b..c5c8c17b 100644 --- a/dynasm/dasm_x86.lua +++ b/dynasm/dasm_x86.lua | |||
@@ -1,7 +1,7 @@ | |||
1 | ------------------------------------------------------------------------------ | 1 | ------------------------------------------------------------------------------ |
2 | -- DynASM x86/x64 module. | 2 | -- DynASM x86/x64 module. |
3 | -- | 3 | -- |
4 | -- Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
5 | -- See dynasm.lua for full copyright notice. | 5 | -- See dynasm.lua for full copyright notice. |
6 | ------------------------------------------------------------------------------ | 6 | ------------------------------------------------------------------------------ |
7 | 7 | ||
diff --git a/dynasm/dynasm.lua b/dynasm/dynasm.lua index 46ebfca8..8e85af24 100644 --- a/dynasm/dynasm.lua +++ b/dynasm/dynasm.lua | |||
@@ -2,7 +2,7 @@ | |||
2 | -- DynASM. A dynamic assembler for code generation engines. | 2 | -- DynASM. A dynamic assembler for code generation engines. |
3 | -- Originally designed and implemented for LuaJIT. | 3 | -- Originally designed and implemented for LuaJIT. |
4 | -- | 4 | -- |
5 | -- Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 5 | -- Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
6 | -- See below for full copyright notice. | 6 | -- See below for full copyright notice. |
7 | ------------------------------------------------------------------------------ | 7 | ------------------------------------------------------------------------------ |
8 | 8 | ||
@@ -17,7 +17,7 @@ local _info = { | |||
17 | url = "http://luajit.org/dynasm.html", | 17 | url = "http://luajit.org/dynasm.html", |
18 | license = "MIT", | 18 | license = "MIT", |
19 | copyright = [[ | 19 | copyright = [[ |
20 | Copyright (C) 2005-2017 Mike Pall. All rights reserved. | 20 | Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
21 | 21 | ||
22 | Permission is hereby granted, free of charge, to any person obtaining | 22 | Permission is hereby granted, free of charge, to any person obtaining |
23 | a copy of this software and associated documentation files (the | 23 | a copy of this software and associated documentation files (the |