diff options
| author | Mike Pall <mike> | 2016-03-03 12:11:37 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-03-03 12:11:37 +0100 |
| commit | f4231949b5e14e1116452f9e9eea31e19a462c82 (patch) | |
| tree | 8201252fca8a867ea4d1c33736f1a4dbfd77de6b /src/jit | |
| parent | 6f3eed9fd8d4f666f21d1e15cdf377a71a3925cf (diff) | |
| parent | db1b399af134e715b8ba9a0e4ad9cbafbe06ecb1 (diff) | |
| download | luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.gz luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.bz2 luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/jit')
| -rw-r--r-- | src/jit/bc.lua | 2 | ||||
| -rw-r--r-- | src/jit/bcsave.lua | 2 | ||||
| -rw-r--r-- | src/jit/dis_arm.lua | 2 | ||||
| -rw-r--r-- | src/jit/dis_mips.lua | 2 | ||||
| -rw-r--r-- | src/jit/dis_mipsel.lua | 2 | ||||
| -rw-r--r-- | src/jit/dis_ppc.lua | 2 | ||||
| -rw-r--r-- | src/jit/dis_x64.lua | 2 | ||||
| -rw-r--r-- | src/jit/dis_x86.lua | 2 | ||||
| -rw-r--r-- | src/jit/dump.lua | 2 | ||||
| -rw-r--r-- | src/jit/p.lua | 2 | ||||
| -rw-r--r-- | src/jit/v.lua | 2 | ||||
| -rw-r--r-- | src/jit/zone.lua | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/src/jit/bc.lua b/src/jit/bc.lua index 320039ff3..a8cb8496e 100644 --- a/src/jit/bc.lua +++ b/src/jit/bc.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- LuaJIT bytecode listing module. | 2 | -- LuaJIT bytecode listing module. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- | 7 | -- |
diff --git a/src/jit/bcsave.lua b/src/jit/bcsave.lua index 38fc61f93..d0968b187 100644 --- a/src/jit/bcsave.lua +++ b/src/jit/bcsave.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- LuaJIT module to save/list bytecode. | 2 | -- LuaJIT module to save/list bytecode. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- | 7 | -- |
diff --git a/src/jit/dis_arm.lua b/src/jit/dis_arm.lua index dfcbeeecf..1296d816b 100644 --- a/src/jit/dis_arm.lua +++ b/src/jit/dis_arm.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- LuaJIT ARM disassembler module. | 2 | -- LuaJIT ARM disassembler module. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- This is a helper module used by the LuaJIT machine code dumper module. | 7 | -- This is a helper module used by the LuaJIT machine code dumper module. |
diff --git a/src/jit/dis_mips.lua b/src/jit/dis_mips.lua index 9466f45c2..2bf8b389c 100644 --- a/src/jit/dis_mips.lua +++ b/src/jit/dis_mips.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- LuaJIT MIPS disassembler module. | 2 | -- LuaJIT MIPS disassembler module. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT/X license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT/X license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- This is a helper module used by the LuaJIT machine code dumper module. | 7 | -- This is a helper module used by the LuaJIT machine code dumper module. |
diff --git a/src/jit/dis_mipsel.lua b/src/jit/dis_mipsel.lua index f06ffe855..3f2f6efc9 100644 --- a/src/jit/dis_mipsel.lua +++ b/src/jit/dis_mipsel.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- LuaJIT MIPSEL disassembler wrapper module. | 2 | -- LuaJIT MIPSEL disassembler wrapper module. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- This module just exports the little-endian functions from the | 7 | -- This module just exports the little-endian functions from the |
diff --git a/src/jit/dis_ppc.lua b/src/jit/dis_ppc.lua index e077d7acd..30f51ecdc 100644 --- a/src/jit/dis_ppc.lua +++ b/src/jit/dis_ppc.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- LuaJIT PPC disassembler module. | 2 | -- LuaJIT PPC disassembler module. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT/X license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT/X license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- This is a helper module used by the LuaJIT machine code dumper module. | 7 | -- This is a helper module used by the LuaJIT machine code dumper module. |
diff --git a/src/jit/dis_x64.lua b/src/jit/dis_x64.lua index 15d55243a..077b1b127 100644 --- a/src/jit/dis_x64.lua +++ b/src/jit/dis_x64.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- LuaJIT x64 disassembler wrapper module. | 2 | -- LuaJIT x64 disassembler wrapper module. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- This module just exports the 64 bit functions from the combined | 7 | -- This module just exports the 64 bit functions from the combined |
diff --git a/src/jit/dis_x86.lua b/src/jit/dis_x86.lua index a7c05ed6d..f8a21ff30 100644 --- a/src/jit/dis_x86.lua +++ b/src/jit/dis_x86.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- LuaJIT x86/x64 disassembler module. | 2 | -- LuaJIT x86/x64 disassembler module. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- This is a helper module used by the LuaJIT machine code dumper module. | 7 | -- This is a helper module used by the LuaJIT machine code dumper module. |
diff --git a/src/jit/dump.lua b/src/jit/dump.lua index b1cdcfe29..9d8330e18 100644 --- a/src/jit/dump.lua +++ b/src/jit/dump.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- LuaJIT compiler dump module. | 2 | -- LuaJIT compiler dump module. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- | 7 | -- |
diff --git a/src/jit/p.lua b/src/jit/p.lua index 97d4ccdf8..5323728b1 100644 --- a/src/jit/p.lua +++ b/src/jit/p.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- LuaJIT profiler. | 2 | -- LuaJIT profiler. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- | 7 | -- |
diff --git a/src/jit/v.lua b/src/jit/v.lua index 157c34bc6..60c8b05aa 100644 --- a/src/jit/v.lua +++ b/src/jit/v.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- Verbose mode of the LuaJIT compiler. | 2 | -- Verbose mode of the LuaJIT compiler. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- | 7 | -- |
diff --git a/src/jit/zone.lua b/src/jit/zone.lua index 69f0f1691..f5f9656af 100644 --- a/src/jit/zone.lua +++ b/src/jit/zone.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ---------------------------------------------------------------------------- | 1 | ---------------------------------------------------------------------------- |
| 2 | -- LuaJIT profiler zones. | 2 | -- LuaJIT profiler zones. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2016 Mike Pall. All rights reserved. |
| 5 | -- Released under the MIT license. See Copyright Notice in luajit.h | 5 | -- Released under the MIT license. See Copyright Notice in luajit.h |
| 6 | ---------------------------------------------------------------------------- | 6 | ---------------------------------------------------------------------------- |
| 7 | -- | 7 | -- |
