diff options
author | Mike Pall <mike> | 2017-01-17 12:41:05 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2017-01-17 12:41:05 +0100 |
commit | 71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd (patch) | |
tree | 898e706d4b2455c2c3799cc179f3bc7adf096858 /dynasm | |
parent | c94b921f924c1b37fea52e34f4e01ba8b37d77d0 (diff) | |
parent | b93a1dd0c831cab22f98163d0dde792a493c0eef (diff) | |
download | luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.gz luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.bz2 luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.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 | 2 | ||||
-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, 15 insertions, 15 deletions
diff --git a/dynasm/dasm_arm.h b/dynasm/dasm_arm.h index 0fa69ac0..a43f7c66 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-2016 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2017 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 e2ed922a..32f595af 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-2016 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2017 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 d64e60a3..47e1e074 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-2016 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2017 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 4a7d8dfe..8a5f735d 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-2016 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2017 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 f3b43211..4b49fd8c 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-2016 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2017 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 c8010561..78a4e34a 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-2016 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2017 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_mips64.lua b/dynasm/dasm_mips64.lua index 94f21921..5636b23a 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-2016 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2017 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 3f267fb8..3a7ee9b0 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-2016 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2017 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 e2f704ec..f73974dd 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-2016 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2017 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 22a654cb..59d9e2b2 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-2016 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2017 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 21333556..e8bdeb37 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-2016 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2017 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 bf5b7296..bc636357 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-2016 Mike Pall. All rights reserved. | 3 | ** Copyright (C) 2005-2017 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 a5efd98f..4c031e2c 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-2016 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2017 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 1e5899a4..5ec21a79 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-2016 Mike Pall. All rights reserved. | 5 | -- Copyright (C) 2005-2017 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-2016 Mike Pall. All rights reserved. | 20 | Copyright (C) 2005-2017 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 |